bugfix (CollaSet): pod creation error is not thrown out (#37)

* bugfix (CollaSet): pod creation error is not thrown out
KusionStack · Aug 21, 2023 · f9cb738 · f9cb738
1 parent f3de7b0
commit f9cb738
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/pkg/controllers/collaset/synccontrol/sync_control.go b/pkg/controllers/collaset/synccontrol/sync_control.go
@@ -170,13 +170,12 @@ func (sc *RealSyncControl) Scale(set *appsv1alpha1.CollaSet, podWrappers []*coll
 			newPod.Labels[appsv1alpha1.PodInstanceIDLabelKey] = fmt.Sprintf("%d", availableIDContext.ID)
 
 			klog.V(1).Info("try to create Pod with revision %s from CollaSet %s/%s", revision.Name, set.Namespace, set.Name)
-			if pod, err := sc.podControl.CreatePod(newPod); err == nil {
-				// add an expectation for this pod creation, before next reconciling
-				if err := collasetutils.ActiveExpectations.ExpectCreate(set, expectations.Pod, pod.Name); err != nil {
-					return err
-				}
+			if pod, err = sc.podControl.CreatePod(newPod); err != nil {
+				return err
 			}
-			return err
+
+			// add an expectation for this pod creation, before next reconciling
+			return collasetutils.ActiveExpectations.ExpectCreate(set, expectations.Pod, pod.Name)
 		})
 
 		sc.recorder.Eventf(set, corev1.EventTypeNormal, "ScaleOut", "scale out %d Pod(s)", succCount)