K8SPSMDB-946: Improve backup status (#1321)

Author: inelpandzic

config/crd/bases/psmdb.percona.com_perconaservermongodbbackups.yaml

@@ -99,6 +99,8 @@ spec:
                 type: string
               pbmName:
                 type: string
+              pbmPod:
+                type: string
               replsetNames:
                 items:
                   type: string

config/crd/bases/psmdb.percona.com_perconaservermongodbrestores.yaml

@@ -69,6 +69,8 @@ spec:
                     type: string
                   pbmName:
                     type: string
+                  pbmPod:
+                    type: string
                   replsetNames:
                     items:
                       type: string

deploy/bundle.yaml

@@ -98,6 +98,8 @@ spec:
                 type: string
               pbmName:
                 type: string
+              pbmPod:
+                type: string
               replsetNames:
                 items:
                   type: string
@@ -227,6 +229,8 @@ spec:
                     type: string
                   pbmName:
                     type: string
+                  pbmPod:
+                    type: string
                   replsetNames:
                     items:
                       type: string

deploy/crd.yaml

@@ -98,6 +98,8 @@ spec:
                 type: string
               pbmName:
                 type: string
+              pbmPod:
+                type: string
               replsetNames:
                 items:
                   type: string
@@ -227,6 +229,8 @@ spec:
                     type: string
                   pbmName:
                     type: string
+                  pbmPod:
+                    type: string
                   replsetNames:
                     items:
                       type: string

deploy/cw-bundle.yaml

@@ -98,6 +98,8 @@ spec:
                 type: string
               pbmName:
                 type: string
+              pbmPod:
+                type: string
               replsetNames:
                 items:
                   type: string
@@ -227,6 +229,8 @@ spec:
                     type: string
                   pbmName:
                     type: string
+                  pbmPod:
+                    type: string
                   replsetNames:
                     items:
                       type: string

e2e-tests/version-service/conf/crd.yaml

@@ -98,6 +98,8 @@ spec:
                 type: string
               pbmName:
                 type: string
+              pbmPod:
+                type: string
               replsetNames:
                 items:
                   type: string
@@ -227,6 +229,8 @@ spec:
                     type: string
                   pbmName:
                     type: string
+                  pbmPod:
+                    type: string
                   replsetNames:
                     items:
                       type: string

pkg/apis/psmdb/v1/perconaservermongodbbackup_types.go

@@ -45,6 +45,7 @@ type PerconaServerMongoDBBackupStatus struct {
 	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"`
 }
 

pkg/controller/perconaservermongodbbackup/backup.go

@@ -164,6 +164,12 @@ func (b *Backup) Status(ctx context.Context, cr *api.PerconaServerMongoDBBackup)
 	}
 	status.Type = cr.Spec.Type
 
+	node, err := b.pbm.Node()
+	if err != nil {
+		return status, nil
+	}
+	status.PBMPod = node
+
 	return status, nil
 }
 

pkg/psmdb/backup/fake/pbm.go

@@ -71,3 +71,7 @@ func (p *fakePBM) GetConfigVar(key string) (any, error) {
 func (p *fakePBM) DeleteConfigVar(key string) error {
 	return nil
 }
+
+func (p *fakePBM) Node() (string, error) {
+	return "", nil
+}

pkg/psmdb/backup/pbm.go

@@ -38,6 +38,7 @@ type pbmC struct {
 	*pbm.PBM
 	k8c       client.Client
 	namespace string
+	rsName    string
 }
 
 type PBM interface {
@@ -62,6 +63,8 @@ type PBM interface {
 	SetConfigVar(key, val string) error
 	GetConfigVar(key string) (any, error)
 	DeleteConfigVar(key string) error
+
+	Node() (string, error)
 }
 
 func getMongoUri(ctx context.Context, k8sclient client.Client, cr *api.PerconaServerMongoDB, addrs []string) (string, error) {
@@ -159,6 +162,7 @@ func NewPBM(ctx context.Context, c client.Client, cluster *api.PerconaServerMong
 		PBM:       pbmc,
 		k8c:       c,
 		namespace: cluster.Namespace,
+		rsName:    rs.Name,
 	}, nil
 }
 
@@ -478,3 +482,13 @@ func (b *pbmC) GetPITRChunkContains(ctx context.Context, unixTS int64) (*pbm.Opl
 
 	return c, nil
 }
+
+// Node returns replset node chosen to run the backup
+func (p *pbmC) Node() (string, error) {
+	lock, err := p.GetLockData(&pbm.LockHeader{Replset: p.rsName})
+	if err != nil {
+		return "", err
+	}
+
+	return strings.Split(lock.Node, ".")[0], nil
+}