Merge pull request #915 from Cloudzp/fix_recommendation_trigger_err

mfanjie · web-flow · commit 2b0ddae8ebbc · 2024-12-19T19:55:09.000-06:00
fix the issue that trigger recommendation by run number abormal
diff --git a/pkg/controller/recommendation/recommendation_trigger_controller.go b/pkg/controller/recommendation/recommendation_trigger_controller.go
@@ -101,12 +101,11 @@ func (c *RecommendationTriggerController) Reconcile(ctx context.Context, req ctr
 		}
 	}
 
+	executeIdentity(context.TODO(), nil, c.RecommenderMgr, c.Provider, c.PredictorMgr, recommendationRule, id, c.Client, c.ScaleClient, c.OOMRecorder, metav1.Now(), newStatus.RunNumber)
 	if currentMissionIndex == -1 {
 		klog.Warningf("cannot found recommendation mission %s", recommendationRuleRef.Name)
 		return ctrl.Result{}, nil
 	}
-
-	executeIdentity(context.TODO(), nil, c.RecommenderMgr, c.Provider, c.PredictorMgr, recommendationRule, id, c.Client, c.ScaleClient, c.OOMRecorder, metav1.Now(), newStatus.RunNumber)
 	if newStatus.Recommendations[currentMissionIndex].Message != "Success" {
 		err = c.Client.Delete(context.TODO(), recommendation)
 		if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -101,12 +101,11 @@ func (c *RecommendationTriggerController) Reconcile(ctx context.Context, req ctr`
`101`	`101`	`}`
`102`	`102`	`}`
`103`	`103`
	`104`	`+ executeIdentity(context.TODO(), nil, c.RecommenderMgr, c.Provider, c.PredictorMgr, recommendationRule, id, c.Client, c.ScaleClient, c.OOMRecorder, metav1.Now(), newStatus.RunNumber)`
`104`	`105`	`if currentMissionIndex == -1 {`
`105`	`106`	`klog.Warningf("cannot found recommendation mission %s", recommendationRuleRef.Name)`
`106`	`107`	`return ctrl.Result{}, nil`
`107`	`108`	`}`
`108`		`-`
`109`		`- executeIdentity(context.TODO(), nil, c.RecommenderMgr, c.Provider, c.PredictorMgr, recommendationRule, id, c.Client, c.ScaleClient, c.OOMRecorder, metav1.Now(), newStatus.RunNumber)`
`110`	`109`	`if newStatus.Recommendations[currentMissionIndex].Message != "Success" {`
`111`	`110`	`err = c.Client.Delete(context.TODO(), recommendation)`
`112`	`111`	`if err != nil {`