avoid marking running status when it hits error (#874)

Daniel-Fan · web-flow · commit c6c03c3cfb0b · 2023-01-04T23:24:04.000+08:00
Signed-off-by: Daniel Fan &lt;fanyuchensx@gmail.com&gt;

Signed-off-by: Daniel Fan &lt;fanyuchensx@gmail.com&gt;
diff --git a/controllers/operandrequest/reconcile_operand.go b/controllers/operandrequest/reconcile_operand.go
@@ -173,6 +173,7 @@ func (r *Reconciler) reconcileOperand(ctx context.Context, requestInstance *oper
 					if err != nil {
 						merr.Add(err)
 						requestInstance.SetMemberStatus(operand.Name, "", operatorv1alpha1.ServiceFailed, &r.Mutex)
+						continue
 					}
 				} else if apierrors.IsNotFound(err) {
 					klog.Infof("Not Found OperandConfig: %s/%s", operand.Name, err)
@@ -186,6 +187,7 @@ func (r *Reconciler) reconcileOperand(ctx context.Context, requestInstance *oper
 				if err != nil {
 					merr.Add(err)
 					requestInstance.SetMemberStatus(operand.Name, "", operatorv1alpha1.ServiceFailed, &r.Mutex)
+					continue
 				}
 			}
 			requestInstance.SetMemberStatus(operand.Name, "", operatorv1alpha1.ServiceRunning, &r.Mutex)

Original file line number	Diff line number	Diff line change
`@@ -173,6 +173,7 @@ func (r Reconciler) reconcileOperand(ctx context.Context, requestInstance oper`
`173`	`173`	`if err != nil {`
`174`	`174`	`merr.Add(err)`
`175`	`175`	`requestInstance.SetMemberStatus(operand.Name, "", operatorv1alpha1.ServiceFailed, &r.Mutex)`
	`176`	`+ continue`
`176`	`177`	`}`
`177`	`178`	`} else if apierrors.IsNotFound(err) {`
`178`	`179`	`klog.Infof("Not Found OperandConfig: %s/%s", operand.Name, err)`
`@@ -186,6 +187,7 @@ func (r Reconciler) reconcileOperand(ctx context.Context, requestInstance oper`
`186`	`187`	`if err != nil {`
`187`	`188`	`merr.Add(err)`
`188`	`189`	`requestInstance.SetMemberStatus(operand.Name, "", operatorv1alpha1.ServiceFailed, &r.Mutex)`
	`190`	`+ continue`
`189`	`191`	`}`
`190`	`192`	`}`
`191`	`193`	`requestInstance.SetMemberStatus(operand.Name, "", operatorv1alpha1.ServiceRunning, &r.Mutex)`