status_cluster: add argument to skip checkDependency (#192)

Signed-off-by: haorenfsa <[email protected]>
zilliztech · Sep 24, 2024 · 20f7176 · 20f7176
1 parent cef14bc
commit 20f7176
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 26 deletions.
diff --git a/pkg/controllers/deploy_ctrl.go b/pkg/controllers/deploy_ctrl.go
@@ -200,7 +200,7 @@ func (c *DeployControllerBizImpl) IsUpdating(ctx context.Context, mc v1beta1.Mil
 	if mc.Spec.IsStopping() {
 		return false, nil
 	}
-	err := c.statusSyncer.UpdateStatusForNewGeneration(ctx, &mc)
+	err := c.statusSyncer.UpdateStatusForNewGeneration(ctx, &mc, false)
 	if err != nil {
 		return false, errors.Wrap(err, "update status for new generation")
 	}

diff --git a/pkg/controllers/deploy_ctrl_test.go b/pkg/controllers/deploy_ctrl_test.go
@@ -247,20 +247,20 @@ func TestDeployControllerBizImpl_IsUpdating(t *testing.T) {
 	})
 
 	t.Run("update status failed", func(t *testing.T) {
-		mockStatusSyncer.EXPECT().UpdateStatusForNewGeneration(ctx, &mc).Return(errMock)
+		mockStatusSyncer.EXPECT().UpdateStatusForNewGeneration(ctx, &mc, false).Return(errMock)
 		_, err := bizImpl.IsUpdating(ctx, mc)
 		assert.Error(t, err)
 	})
 
 	t.Run("milvus condition not exist, sugguests updating", func(t *testing.T) {
-		mockStatusSyncer.EXPECT().UpdateStatusForNewGeneration(ctx, &mc).Return(nil)
+		mockStatusSyncer.EXPECT().UpdateStatusForNewGeneration(ctx, &mc, false).Return(nil)
 		ret, err := bizImpl.IsUpdating(ctx, mc)
 		assert.NoError(t, err)
 		assert.True(t, ret)
 	})
 
 	t.Run("milvus condition shows updating", func(t *testing.T) {
-		mockStatusSyncer.EXPECT().UpdateStatusForNewGeneration(ctx, &mc).Return(nil)
+		mockStatusSyncer.EXPECT().UpdateStatusForNewGeneration(ctx, &mc, false).Return(nil)
 		mc.Status.Conditions = []v1beta1.MilvusCondition{
 			{
 				Type:   v1beta1.MilvusUpdated,
@@ -280,14 +280,14 @@ func TestDeployControllerBizImpl_IsUpdating(t *testing.T) {
 	}
 
 	t.Run("get old deploy failed", func(t *testing.T) {
-		mockStatusSyncer.EXPECT().UpdateStatusForNewGeneration(ctx, &mc).Return(nil)
+		mockStatusSyncer.EXPECT().UpdateStatusForNewGeneration(ctx, &mc, false).Return(nil)
 		mockUtil.EXPECT().GetOldDeploy(ctx, mc, component).Return(nil, errMock)
 		_, err := bizImpl.IsUpdating(ctx, mc)
 		assert.Error(t, err)
 	})
 
 	t.Run("is new rollout, so updating", func(t *testing.T) {
-		mockStatusSyncer.EXPECT().UpdateStatusForNewGeneration(ctx, &mc).Return(nil)
+		mockStatusSyncer.EXPECT().UpdateStatusForNewGeneration(ctx, &mc, false).Return(nil)
 		deploy := appsv1.Deployment{}
 
 		mockUtil.EXPECT().GetOldDeploy(ctx, mc, component).Return(&deploy, nil)
@@ -300,7 +300,7 @@ func TestDeployControllerBizImpl_IsUpdating(t *testing.T) {
 	})
 
 	t.Run("not updating", func(t *testing.T) {
-		mockStatusSyncer.EXPECT().UpdateStatusForNewGeneration(ctx, &mc).Return(nil)
+		mockStatusSyncer.EXPECT().UpdateStatusForNewGeneration(ctx, &mc, false).Return(nil)
 		deploy := appsv1.Deployment{}
 
 		mockUtil.EXPECT().GetOldDeploy(ctx, mc, component).Return(&deploy, nil)

diff --git a/pkg/controllers/milvus_controller.go b/pkg/controllers/milvus_controller.go
@@ -188,7 +188,8 @@ func (r *MilvusReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr
 		return ctrl.Result{}, err
 	}
 
-	if err := r.statusSyncer.UpdateStatusForNewGeneration(ctx, milvus); err != nil {
+	// not check dependency, to avoid blocking too long
+	if err := r.statusSyncer.UpdateStatusForNewGeneration(ctx, milvus, false); err != nil {
 		return ctrl.Result{}, err
 	}
 	// metrics

diff --git a/pkg/controllers/status_cluster.go b/pkg/controllers/status_cluster.go
@@ -60,7 +60,7 @@ type EtcdEndPointHealth struct {
 // MilvusStatusSyncerInterface abstracts MilvusStatusSyncer
 type MilvusStatusSyncerInterface interface {
 	RunIfNot()
-	UpdateStatusForNewGeneration(ctx context.Context, mc *v1beta1.Milvus) error
+	UpdateStatusForNewGeneration(ctx context.Context, mc *v1beta1.Milvus, checkDependency bool) error
 }
 
 type MilvusStatusSyncer struct {
@@ -218,7 +218,7 @@ func (r *MilvusStatusSyncer) UpdateStatusRoutine(ctx context.Context, mc *v1beta
 	// so we call default again to ensure
 	mc.Default()
 
-	err := r.UpdateStatusForNewGeneration(ctx, mc)
+	err := r.UpdateStatusForNewGeneration(ctx, mc, true)
 	return errors.Wrapf(err, "UpdateStatus for milvus[%s/%s]", mc.Namespace, mc.Name)
 }
 
@@ -252,29 +252,20 @@ func (r *MilvusStatusSyncer) checkDependencyConditions(ctx context.Context, mc *
 	return nil
 }
 
-func (r *MilvusStatusSyncer) UpdateStatusForNewGeneration(ctx context.Context, mc *v1beta1.Milvus) error {
+// UpdateStatusForNewGeneration updates the status of the Milvus CR. if given checkDependency = true, it will check the dependency conditions
+func (r *MilvusStatusSyncer) UpdateStatusForNewGeneration(ctx context.Context, mc *v1beta1.Milvus, checkDependency bool) error {
 	beginStatus := mc.Status.DeepCopy()
 	mc.Status.ObservedGeneration = mc.Generation
 
-	if !Debug {
+	if Debug {
+		checkDependency = false
+	}
+
+	if checkDependency {
 		err := r.checkDependencyConditions(ctx, mc)
 		if err != nil {
 			return errors.Wrap(err, "check dependency conditions failed")
 		}
-	} else {
-		// debug mode, set dependency conditions to true
-		UpdateCondition(&mc.Status, v1beta1.MilvusCondition{
-			Type:   v1beta1.EtcdReady,
-			Status: corev1.ConditionTrue,
-		})
-		UpdateCondition(&mc.Status, v1beta1.MilvusCondition{
-			Type:   v1beta1.StorageReady,
-			Status: corev1.ConditionTrue,
-		})
-		UpdateCondition(&mc.Status, v1beta1.MilvusCondition{
-			Type:   v1beta1.MsgStreamReady,
-			Status: corev1.ConditionTrue,
-		})
 	}
 
 	err := r.UpdateIngressStatus(ctx, mc)