@@ -367,12 +367,12 @@ func (r *ReconcilePerconaServerMongoDBRestore) finishPhysicalRestore(ctx context
367
367
if err != nil {
368
368
return err
369
369
}
370
- for _ , pod := range pods . Items {
370
+ updateConfig := func ( pod corev1. Pod ) error {
371
371
cli , err := r .StandaloneClientWithRole (ctx , cluster , rs , api .RoleClusterAdmin , pod )
372
372
if err != nil {
373
- continue
373
+ return nil
374
374
}
375
- defer cli .Disconnect (ctx )
375
+ defer func () { _ = cli .Disconnect (ctx ) }( )
376
376
377
377
cfg , err := cli .ReadConfig (ctx )
378
378
if err != nil {
@@ -382,6 +382,12 @@ func (r *ReconcilePerconaServerMongoDBRestore) finishPhysicalRestore(ctx context
382
382
if err := cli .WriteConfig (ctx , cfg , true ); err != nil {
383
383
return errors .Wrap (err , "reconfigure replset" )
384
384
}
385
+ return nil
386
+ }
387
+ for _ , pod := range pods .Items {
388
+ if err := updateConfig (pod ); err != nil {
389
+ return err
390
+ }
385
391
}
386
392
return nil
387
393
} else {
@@ -883,7 +889,7 @@ func (r *ReconcilePerconaServerMongoDBRestore) checkIfStatefulSetsAreReadyForPhy
883
889
}
884
890
ready := true
885
891
if err := r .iterateOverMongodSts (ctx , cluster , func (s * appsv1.StatefulSet ) error {
886
- if s .Labels [naming .LabelKubernetesComponent ] == naming .ComponentArbiter || ready == false {
892
+ if s .Labels [naming .LabelKubernetesComponent ] == naming .ComponentArbiter || ! ready {
887
893
return nil
888
894
}
889
895
var err error
@@ -909,7 +915,7 @@ func (r *ReconcilePerconaServerMongoDBRestore) isStatefulSetReady(ctx context.Co
909
915
return false , errors .Wrapf (err , "get replset %s pods" , sts .Labels [naming .LabelKubernetesReplset ])
910
916
}
911
917
for _ , pod := range podList .Items {
912
- if pod .ObjectMeta . Labels ["controller-revision-hash" ] != sts .Status .UpdateRevision {
918
+ if pod .Labels ["controller-revision-hash" ] != sts .Status .UpdateRevision {
913
919
return false , nil
914
920
}
915
921
}
0 commit comments