fix: should not block a continued task (#48)

ShiningRush · Dec 18, 2023 · 6ddfd94 · 6ddfd94
1 parent e6c7544
commit 6ddfd94
Show file tree

Hide file tree

Showing 2 changed files with 92 additions and 1 deletion.
diff --git a/pkg/entity/task.go b/pkg/entity/task.go
@@ -301,11 +301,16 @@ func (t *TaskInstance) Run(params interface{}, act run.Action) (err error) {
 
 // DoPreCheck
 func (t *TaskInstance) DoPreCheck(dagIns *DagInstance) (isActive bool, err error) {
-	if t.PreChecks == nil {
+	if t.PreChecks == nil || t.IsLastState() {
 		return
 	}
 
 	for k, c := range t.PreChecks {
+		// we should not block a continued task
+		if c.Act == ActiveActionBlock && !t.CanBlock() {
+			continue
+		}
+
 		if c.IsMeet(dagIns) {
 			switch c.Act {
 			case ActiveActionSkip:
@@ -323,6 +328,23 @@ func (t *TaskInstance) DoPreCheck(dagIns *DagInstance) (isActive bool, err error
 	return
 }
 
+func (t *TaskInstance) IsLastState() bool {
+	switch t.Status {
+	case TaskInstanceStatusFailed, TaskInstanceStatusCanceled, TaskInstanceStatusSuccess, TaskInstanceStatusSkipped:
+		return true
+	default:
+		return false
+	}
+}
+
+func (t *TaskInstance) CanBlock() bool {
+	if t.Status == TaskInstanceStatusContinue {
+		return false
+	}
+
+	return true
+}
+
 // TaskInstanceStatus
 type TaskInstanceStatus string
 

diff --git a/pkg/entity/task_test.go b/pkg/entity/task_test.go
@@ -685,6 +685,72 @@ func TestTaskInstance_DoPreCheck(t *testing.T) {
 			wantRet: false,
 			wantErr: fmt.Errorf("pre-check[first] act is invalid: invalid-act"),
 		},
+		{
+			caseDesc: "last-state-task",
+			giveTaskIns: &TaskInstance{
+				PreChecks: PreChecks{
+					"first": {
+						Conditions: []TaskCondition{
+							{
+								Source: TaskConditionSourceVars,
+								Key:    "key1",
+								Values: []string{"value3"},
+								Op:     OperatorIn,
+							},
+						},
+						Act: "block",
+					},
+				},
+				Status: TaskInstanceStatusFailed,
+			},
+			giveDagIns: &DagInstance{
+				Vars: DagInstanceVars{
+					"key1": {Value: "value3"},
+				},
+			},
+			wantRet: false,
+		},
+		{
+			caseDesc: "continue-task",
+			giveTaskIns: &TaskInstance{
+				PreChecks: PreChecks{
+					"first": {
+						Conditions: []TaskCondition{
+							{
+								Source: TaskConditionSourceVars,
+								Key:    "key1",
+								Values: []string{"value3"},
+								Op:     OperatorIn,
+							},
+						},
+						Act: ActiveActionBlock,
+					},
+				},
+				Status: TaskInstanceStatusContinue,
+			},
+			giveDagIns: &DagInstance{
+				Vars: DagInstanceVars{
+					"key1": {Value: "value3"},
+				},
+			},
+			wantRet: false,
+			wantTaskIns: &TaskInstance{
+				PreChecks: PreChecks{
+					"first": {
+						Conditions: []TaskCondition{
+							{
+								Source: TaskConditionSourceVars,
+								Key:    "key1",
+								Values: []string{"value3"},
+								Op:     OperatorIn,
+							},
+						},
+						Act: ActiveActionBlock,
+					},
+				},
+				Status: TaskInstanceStatusContinue,
+			},
+		},
 	}
 
 	for _, tc := range tests {
@@ -693,6 +759,9 @@ func TestTaskInstance_DoPreCheck(t *testing.T) {
 			assert.Equal(t, tc.wantRet, ret)
 			assert.Equal(t, tc.wantErr, err)
 			if err == nil {
+				if tc.wantTaskIns == nil {
+					return
+				}
 				assert.Equal(t, tc.wantTaskIns, tc.giveTaskIns)
 			}
 		})