K8SPSMDB-985: All PBM backup nodes in the status (#1500)

inelpandzic · web-flow · commit af550c2c4528 · 2024-04-09T11:13:25.000+03:00
* Get pbm nodes.

* Add PBMPods.

* Fix fake impl.

* Refactor

* Use backupMeta to get backup nodes.

* Get only pod name.

* Refactor
diff --git a/config/crd/bases/psmdb.percona.com_perconaservermongodbbackups.yaml b/config/crd/bases/psmdb.percona.com_perconaservermongodbbackups.yaml
@@ -105,6 +105,10 @@ spec:
                 type: string
               pbmPod:
                 type: string
+              pbmPods:
+                additionalProperties:
+                  type: string
+                type: object
               replsetNames:
                 items:
                   type: string
diff --git a/config/crd/bases/psmdb.percona.com_perconaservermongodbrestores.yaml b/config/crd/bases/psmdb.percona.com_perconaservermongodbrestores.yaml
@@ -75,6 +75,10 @@ spec:
                     type: string
                   pbmPod:
                     type: string
+                  pbmPods:
+                    additionalProperties:
+                      type: string
+                    type: object
                   replsetNames:
                     items:
                       type: string
diff --git a/deploy/bundle.yaml b/deploy/bundle.yaml
@@ -104,6 +104,10 @@ spec:
                 type: string
               pbmPod:
                 type: string
+              pbmPods:
+                additionalProperties:
+                  type: string
+                type: object
               replsetNames:
                 items:
                   type: string
@@ -234,6 +238,10 @@ spec:
                     type: string
                   pbmPod:
                     type: string
+                  pbmPods:
+                    additionalProperties:
+                      type: string
+                    type: object
                   replsetNames:
                     items:
                       type: string
diff --git a/deploy/crd.yaml b/deploy/crd.yaml
@@ -104,6 +104,10 @@ spec:
                 type: string
               pbmPod:
                 type: string
+              pbmPods:
+                additionalProperties:
+                  type: string
+                type: object
               replsetNames:
                 items:
                   type: string
@@ -234,6 +238,10 @@ spec:
                     type: string
                   pbmPod:
                     type: string
+                  pbmPods:
+                    additionalProperties:
+                      type: string
+                    type: object
                   replsetNames:
                     items:
                       type: string
diff --git a/deploy/cw-bundle.yaml b/deploy/cw-bundle.yaml
@@ -104,6 +104,10 @@ spec:
                 type: string
               pbmPod:
                 type: string
+              pbmPods:
+                additionalProperties:
+                  type: string
+                type: object
               replsetNames:
                 items:
                   type: string
@@ -234,6 +238,10 @@ spec:
                     type: string
                   pbmPod:
                     type: string
+                  pbmPods:
+                    additionalProperties:
+                      type: string
+                    type: object
                   replsetNames:
                     items:
                       type: string
diff --git a/e2e-tests/version-service/conf/crd.yaml b/e2e-tests/version-service/conf/crd.yaml
@@ -104,6 +104,10 @@ spec:
                 type: string
               pbmPod:
                 type: string
+              pbmPods:
+                additionalProperties:
+                  type: string
+                type: object
               replsetNames:
                 items:
                   type: string
@@ -234,6 +238,10 @@ spec:
                     type: string
                   pbmPod:
                     type: string
+                  pbmPods:
+                    additionalProperties:
+                      type: string
+                    type: object
                   replsetNames:
                     items:
                       type: string
diff --git a/pkg/apis/psmdb/v1/perconaservermongodbbackup_types.go b/pkg/apis/psmdb/v1/perconaservermongodbbackup_types.go
@@ -35,20 +35,23 @@ const (
 
 // PerconaServerMongoDBBackupStatus defines the observed state of PerconaServerMongoDBBackup
 type PerconaServerMongoDBBackupStatus struct {
-	Type                 defs.BackupType         `json:"type,omitempty"`
-	State                BackupState             `json:"state,omitempty"`
-	StartAt              *metav1.Time            `json:"start,omitempty"`
-	CompletedAt          *metav1.Time            `json:"completed,omitempty"`
-	LastTransition       *metav1.Time            `json:"lastTransition,omitempty"`
-	Destination          string                  `json:"destination,omitempty"`
-	StorageName          string                  `json:"storageName,omitempty"`
-	S3                   *BackupStorageS3Spec    `json:"s3,omitempty"`
-	Azure                *BackupStorageAzureSpec `json:"azure,omitempty"`
-	ReplsetNames         []string                `json:"replsetNames,omitempty"`
-	PBMname              string                  `json:"pbmName,omitempty"`
-	PBMPod               string                  `json:"pbmPod,omitempty"`
-	Error                string                  `json:"error,omitempty"`
-	LatestRestorableTime *metav1.Time            `json:"latestRestorableTime,omitempty"`
+	Type           defs.BackupType         `json:"type,omitempty"`
+	State          BackupState             `json:"state,omitempty"`
+	StartAt        *metav1.Time            `json:"start,omitempty"`
+	CompletedAt    *metav1.Time            `json:"completed,omitempty"`
+	LastTransition *metav1.Time            `json:"lastTransition,omitempty"`
+	Destination    string                  `json:"destination,omitempty"`
+	StorageName    string                  `json:"storageName,omitempty"`
+	S3             *BackupStorageS3Spec    `json:"s3,omitempty"`
+	Azure          *BackupStorageAzureSpec `json:"azure,omitempty"`
+	ReplsetNames   []string                `json:"replsetNames,omitempty"`
+	PBMname        string                  `json:"pbmName,omitempty"`
+
+	// Deprecated: Use PBMPods instead
+	PBMPod               string            `json:"pbmPod,omitempty"`
+	PBMPods              map[string]string `json:"pbmPods,omitempty"`
+	Error                string            `json:"error,omitempty"`
+	LatestRestorableTime *metav1.Time      `json:"latestRestorableTime,omitempty"`
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
diff --git a/pkg/apis/psmdb/v1/zz_generated.deepcopy.go b/pkg/apis/psmdb/v1/zz_generated.deepcopy.go
diff --git a/pkg/controller/perconaservermongodbbackup/backup.go b/pkg/controller/perconaservermongodbbackup/backup.go
@@ -11,6 +11,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 
+	pbmBackup "github.com/percona/percona-backup-mongodb/pbm/backup"
 	"github.com/percona/percona-backup-mongodb/pbm/ctrl"
 	"github.com/percona/percona-backup-mongodb/pbm/defs"
 	pbmErrors "github.com/percona/percona-backup-mongodb/pbm/errors"
@@ -182,9 +183,28 @@ func (b *Backup) Status(ctx context.Context, cr *api.PerconaServerMongoDBBackup)
 	}
 	status.PBMPod = node
 
+	meta, err = b.pbm.GetBackupMeta(ctx, cr.Status.PBMname)
+	if err != nil || meta == nil || meta.Replsets == nil {
+		return status, nil
+	}
+
+	status.PBMPods = backupPods(meta.Replsets)
+
 	return status, nil
 }
 
+func backupPods(replsets []pbmBackup.BackupReplset) map[string]string {
+	pods := make(map[string]string)
+	for _, rs := range replsets {
+		spl := strings.Split(rs.Node, ".")
+		if len(spl) == 0 {
+			continue
+		}
+		pods[rs.Name] = spl[0]
+	}
+	return pods
+}
+
 // Close closes the PBM connection
 func (b *Backup) Close(ctx context.Context) error {
 	if b.pbm == nil {
diff --git a/pkg/psmdb/backup/fake/pbm.go b/pkg/psmdb/backup/fake/pbm.go
@@ -77,7 +77,6 @@ func (p *fakePBM) GetConfigVar(ctx context.Context, key string) (any, error) {
 func (p *fakePBM) DeleteConfigVar(ctx context.Context, key string) error {
 	return nil
 }
-
 func (p *fakePBM) Node(ctx context.Context) (string, error) {
 	return "", nil
 }
diff --git a/pkg/psmdb/backup/pbm.go b/pkg/psmdb/backup/pbm.go
@@ -519,7 +519,7 @@ func (b *pbmC) PITRGetChunksSlice(ctx context.Context, rsName string, from, to p
 	return oplog.PITRGetChunksSlice(ctx, b.Client, rsName, from, to)
 }
 
-// Node returns replset node chosen to run the backup
+// Node returns replset node chosen to run the backup for a replset related to pbmC
 func (b *pbmC) Node(ctx context.Context) (string, error) {
 	lock, err := lock.GetLockData(ctx, b.Client, &lock.LockHeader{Replset: b.rsName})
 	if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,6 @@ func (p *fakePBM) GetConfigVar(ctx context.Context, key string) (any, error) {`
`77`	`77`	`func (p *fakePBM) DeleteConfigVar(ctx context.Context, key string) error {`
`78`	`78`	`return nil`
`79`	`79`	`}`
`80`		`-`
`81`	`80`	`func (p *fakePBM) Node(ctx context.Context) (string, error) {`
`82`	`81`	`return "", nil`
`83`	`82`	`}`