Skip to content

Commit 3460b56

Browse files
egeguneshors
andauthored
K8SPSMDB-1070: Fix panic in delete-psmdb-pods-in-order finalizer (#1525)
* K8SPSMDB-1070: Fix panic in delete-psmdb-pods-in-order finalizer * fix cw-bundle.yaml * fix pause --------- Co-authored-by: Viacheslav Sarzhan <slava.sarzhan@percona.com>
1 parent cd0968e commit 3460b56

File tree

3 files changed

+8
-11
lines changed

3 files changed

+8
-11
lines changed

deploy/cw-bundle.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18300,7 +18300,7 @@ spec:
1830018300
serviceAccountName: percona-server-mongodb-operator
1830118301
containers:
1830218302
- name: percona-server-mongodb-operator
18303-
image: perconalab/percona-server-mongodb-operator:k8spsmdb-755
18303+
image: perconalab/percona-server-mongodb-operator:main
1830418304
imagePullPolicy: Always
1830518305
livenessProbe:
1830618306
failureThreshold: 3

pkg/controller/perconaservermongodb/finalizers.go

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -87,16 +87,14 @@ func (r *ReconcilePerconaServerMongoDB) deletePSMDBPods(ctx context.Context, cr
8787
replsetsDeleted := true
8888
for _, rs := range cr.Spec.Replsets {
8989
if err := r.deleteRSPods(ctx, cr, rs); err != nil {
90-
if err != nil {
91-
switch err {
92-
case errWaitingTermination, errWaitingFirstPrimary:
93-
log.Info(err.Error(), "rs", rs.Name)
94-
default:
95-
log.Error(err, "failed to delete rs pods", "rs", rs.Name)
96-
}
97-
replsetsDeleted = false
98-
continue
90+
switch err {
91+
case errWaitingTermination, errWaitingFirstPrimary:
92+
log.Info(err.Error(), "rs", rs.Name)
93+
default:
94+
log.Error(err, "failed to delete rs pods", "rs", rs.Name)
9995
}
96+
replsetsDeleted = false
97+
continue
10098
}
10199
}
102100
if !replsetsDeleted {

pkg/controller/perconaservermongodb/statefulset.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
logf "sigs.k8s.io/controller-runtime/pkg/log"
1414
)
1515

16-
// TODO: reduce cyclomatic complexity
1716
func (r *ReconcilePerconaServerMongoDB) reconcileStatefulSet(ctx context.Context, cr *api.PerconaServerMongoDB, rs *api.ReplsetSpec, ls map[string]string) (*appsv1.StatefulSet, error) {
1817
log := logf.FromContext(ctx)
1918

0 commit comments

Comments
 (0)