isFailure includes isCancelled

`isFailure` includes `isCancelled`, but some functions are calling these `isFailure` and `isCancelled` separately. This change removes the separate calls to `isCancelled` where `isFailure` already exists.
austinzhao-go · Jun 14, 2022 · 72f20dc · 72f20dc
1 parent df98103
commit 72f20dc
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/pkg/reconciler/pipelinerun/resources/pipelinerunresolution.go b/pkg/reconciler/pipelinerun/resources/pipelinerunresolution.go
@@ -86,7 +86,7 @@ func (t ResolvedPipelineRunTask) isRunning() bool {
 			return false
 		}
 	}
-	return !t.isSuccessful() && !t.isFailure() && !t.isCancelled()
+	return !t.isSuccessful() && !t.isFailure()
 }
 
 // IsCustomTask returns true if the PipelineTask references a Custom Task.

diff --git a/pkg/reconciler/pipelinerun/resources/pipelinerunstate.go b/pkg/reconciler/pipelinerun/resources/pipelinerunstate.go
@@ -339,9 +339,6 @@ func (state PipelineRunState) getRetryableTasks(candidateTasks sets.String) []*R
 func (facts *PipelineRunFacts) IsStopping() bool {
 	for _, t := range facts.State {
 		if facts.isDAGTask(t.PipelineTask.Name) {
-			if t.isCancelled() {
-				return true
-			}
 			if t.isFailure() {
 				return true
 			}