fix

Signed-off-by: Abhradeep Chakraborty <[email protected]>
dragonflydb · Aug 21, 2024 · a02878a · a02878a
1 parent 1055eab
commit a02878a
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 23 deletions.
diff --git a/e2e/dragonfly_controller_test.go b/e2e/dragonfly_controller_test.go
@@ -418,11 +418,13 @@ var _ = Describe("Dragonfly Lifecycle tests", Ordered, FlakeAttempts(3), func()
 			err = k8sClient.Update(ctx, &df)
 			Expect(err).To(BeNil())
 
+			GinkgoLogr.Info("start timestamp", "timestamp", time.Now().UTC())
 			// Wait until Dragonfly object is marked ready
 			err = waitForDragonflyPhase(ctx, k8sClient, name, namespace, controller.PhaseReady, 3*time.Minute)
 			Expect(err).To(BeNil())
 			err = waitForStatefulSetReady(ctx, k8sClient, name, namespace, 3*time.Minute)
 			Expect(err).To(BeNil())
+			GinkgoLogr.Info("end timestamp", "timestamp", time.Now().UTC())
 
 			// Check for service and statefulset
 			var ss appsv1.StatefulSet
@@ -524,11 +526,11 @@ var _ = Describe("Dragonfly Lifecycle tests", Ordered, FlakeAttempts(3), func()
 			err = k8sClient.Update(ctx, &df)
 			Expect(err).To(BeNil())
 
-			// // Wait until Dragonfly object is marked ready
-			// err = waitForDragonflyPhase(ctx, k8sClient, name, namespace, controller.PhaseReady, 1*time.Minute)
-			// Expect(err).To(BeNil())
-			// err = waitForStatefulSetReady(ctx, k8sClient, name, namespace, 3*time.Minute)
-			// Expect(err).To(BeNil())
+			// Wait until Dragonfly object is marked ready
+			err = waitForDragonflyPhase(ctx, k8sClient, name, namespace, controller.PhaseReady, 1*time.Minute)
+			Expect(err).To(BeNil())
+			err = waitForStatefulSetReady(ctx, k8sClient, name, namespace, 3*time.Minute)
+			Expect(err).To(BeNil())
 
 			var svc corev1.Service
 			err = k8sClient.Get(ctx, types.NamespacedName{

diff --git a/internal/controller/dragonfly_controller.go b/internal/controller/dragonfly_controller.go
@@ -131,24 +131,6 @@ func (r *DragonflyReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 		}
 	}
 
-	// perform a rollout only if the pod spec has changed
-	// Check if the pod spec has changed
-	log.Info("Checking if pod spec has changed", "updatedReplicas", statefulSet.Status.UpdatedReplicas, "currentReplicas", statefulSet.Status.Replicas)
-	if statefulSet.Status.UpdatedReplicas != statefulSet.Status.Replicas {
-		log.Info("Pod spec has changed, performing a rollout")
-		r.EventRecorder.Event(&df, corev1.EventTypeNormal, "Rollout", "Starting a rollout")
-
-		// Start rollout and update status
-		// update status so that we can track progress
-		df.Status.IsRollingUpdate = true
-		if err := r.Status().Update(ctx, &df); err != nil {
-			log.Error(err, "could not update the Dragonfly object")
-			return ctrl.Result{Requeue: true}, err
-		}
-
-		r.EventRecorder.Event(&df, corev1.EventTypeNormal, "Resources", "Performing a rollout")
-	}
-
 	log.Info("Updated resources for object")
 	r.EventRecorder.Event(&df, corev1.EventTypeNormal, "Resources", "Updated resources")
 
@@ -303,6 +285,22 @@ func (r *DragonflyReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 		}
 
 		return ctrl.Result{}, nil
+	} else if statefulSet.Status.UpdatedReplicas != statefulSet.Status.Replicas {
+		// perform a rollout only if the pod spec has changed
+		// Check if the pod spec has changed
+		log.Info("Checking if pod spec has changed", "updatedReplicas", statefulSet.Status.UpdatedReplicas, "currentReplicas", statefulSet.Status.Replicas)
+		log.Info("Pod spec has changed, performing a rollout")
+		r.EventRecorder.Event(&df, corev1.EventTypeNormal, "Rollout", "Starting a rollout")
+
+		// Start rollout and update status
+		// update status so that we can track progress
+		df.Status.IsRollingUpdate = true
+		if err := r.Status().Update(ctx, &df); err != nil {
+			log.Error(err, "could not update the Dragonfly object")
+			return ctrl.Result{Requeue: true}, err
+		}
+
+		r.EventRecorder.Event(&df, corev1.EventTypeNormal, "Resources", "Performing a rollout")
 	}
 	return ctrl.Result{Requeue: true}, nil
 }