Skip to content

Commit 19de9e6

Browse files
committed
fix lint
1 parent 49cc044 commit 19de9e6

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

pkg/controller/perconaservermongodbrestore/physical.go

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -367,12 +367,12 @@ func (r *ReconcilePerconaServerMongoDBRestore) finishPhysicalRestore(ctx context
367367
if err != nil {
368368
return err
369369
}
370-
for _, pod := range pods.Items {
370+
updateConfig := func(pod corev1.Pod) error {
371371
cli, err := r.StandaloneClientWithRole(ctx, cluster, rs, api.RoleClusterAdmin, pod)
372372
if err != nil {
373-
continue
373+
return nil
374374
}
375-
defer cli.Disconnect(ctx)
375+
defer func() { _ = cli.Disconnect(ctx) }()
376376

377377
cfg, err := cli.ReadConfig(ctx)
378378
if err != nil {
@@ -382,6 +382,12 @@ func (r *ReconcilePerconaServerMongoDBRestore) finishPhysicalRestore(ctx context
382382
if err := cli.WriteConfig(ctx, cfg, true); err != nil {
383383
return errors.Wrap(err, "reconfigure replset")
384384
}
385+
return nil
386+
}
387+
for _, pod := range pods.Items {
388+
if err := updateConfig(pod); err != nil {
389+
return err
390+
}
385391
}
386392
return nil
387393
} else {
@@ -883,7 +889,7 @@ func (r *ReconcilePerconaServerMongoDBRestore) checkIfStatefulSetsAreReadyForPhy
883889
}
884890
ready := true
885891
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 {
887893
return nil
888894
}
889895
var err error
@@ -909,7 +915,7 @@ func (r *ReconcilePerconaServerMongoDBRestore) isStatefulSetReady(ctx context.Co
909915
return false, errors.Wrapf(err, "get replset %s pods", sts.Labels[naming.LabelKubernetesReplset])
910916
}
911917
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 {
913919
return false, nil
914920
}
915921
}

0 commit comments

Comments
 (0)