Merge pull request #268 from openshift-cherrypick-robot/cherry-pick-2…

…50-to-18.0.0-proposed [18.0.0-proposed] Fix race condition if ring rebalance is needed
openstack-k8s-operators · Sep 13, 2024 · 22ce49c · 22ce49c
2 parents f843fbc + 929f0e4
commit 22ce49c
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/controllers/swiftring_controller.go b/controllers/swiftring_controller.go
@@ -202,8 +202,10 @@ func (r *SwiftRingReconciler) reconcileNormal(ctx context.Context, instance *swi
 					return ctrl.Result{}, err
 				}
 			}
+			return ctrl.Result{}, nil
 		}
 
+		// will only be updated if job does not exist (anymore)
 		instance.Status.Hash[swiftv1beta1.RingCreateHash] = ""
 		instance.Status.Hash[swiftv1beta1.DeviceListHash] = deviceListHash
 	}