enhancement (CollaSet): if Pod is not during updating, its update pro… (

#41) enhancement (CollaSet): if Pod is not during updating, its update progress needs not to be checked
KusionStack · Aug 21, 2023 · 3d9f496 · 3d9f496
1 parent 460d36b
commit 3d9f496
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/pkg/controllers/collaset/synccontrol/sync_control.go b/pkg/controllers/collaset/synccontrol/sync_control.go
@@ -463,7 +463,11 @@ func (sc *RealSyncControl) Update(set *appsv1alpha1.CollaSet, podWrapers []*coll
 	succCount, err = controllerutils.SlowStartBatch(len(podUpdateInfos), controllerutils.SlowStartInitialBatchSize, false, func(i int, _ error) error {
 		podInfo := podUpdateInfos[i]
 
-		// check Pod update is finished or not
+		if !podInfo.isDuringOps {
+			return nil
+		}
+
+		// check Pod is during updating, and it is finished or not
 		finished, msg, err := updater.GetPodUpdateFinishStatus(podInfo)
 		if err != nil {
 			return fmt.Errorf("fail to get pod %s/%s update finished: %s", podInfo.Namespace, podInfo.Name, err)

diff --git a/pkg/controllers/collaset/synccontrol/update.go b/pkg/controllers/collaset/synccontrol/update.go
@@ -350,7 +350,7 @@ func (u *RecreatePodUpdater) AnalyseAndGetUpdatedPod(_ *appsv1alpha1.CollaSet, _
 	return false, false, nil, nil
 }
 
-func (u *RecreatePodUpdater) GetPodUpdateFinishStatus(podUpdateInfo *PodUpdateInfo) (finished bool, msg string, err error) {
+func (u *RecreatePodUpdater) GetPodUpdateFinishStatus(podInfo *PodUpdateInfo) (finished bool, msg string, err error) {
 	// Recreate policy alway treat Pod as update finished
-	return podUpdateInfo.IsUpdatedRevision, "", nil
+	return podInfo.IsUpdatedRevision, "", nil
 }