Restart cancelled jobs when needed

2 files changed, 138 insertions, 2 deletions

diff --git a/src/Job.hs b/src/Job.hs
index 7701da0..10fe865 100644
--- a/src/Job.hs
+++ b/src/Job.hs
@@ -226,8 +226,14 @@ runJobs mngr@JobManager {..} tout jobs rerun = do
             managed <- readTVar jmJobs
             ( job, tid, ) <$> case M.lookup (jobId job) managed of
                 Just origVar -> do
-                    newTVar . JobDuplicate (jobId job) =<< readTVar origVar
-
+                    readTVar origVar >>= \case
+                        JobCancelled -> do
+                            -- Restart previously cancelled job
+                            statusVar <- newTVar JobQueued
+                            writeTVar jmJobs $ M.insert (jobId job) statusVar managed
+                            return statusVar
+                        pstatus -> do
+                            newTVar $ JobDuplicate (jobId job) pstatus
                 Nothing -> do
                     statusVar <- newTVar JobQueued
                     writeTVar jmJobs $ M.insert (jobId job) statusVar managed
diff --git a/test/script/run.et b/test/script/run.et
index 4944f13..104562e 100644
--- a/test/script/run.et
+++ b/test/script/run.et
@@ -730,3 +730,133 @@ test WatchBranchAndCancel:
             shell on n:
                 echo -n > $path
             expect from p /job-finish $commit.first done/
+
+
+test RestartCancelledJobs:
+    node n
+    shell on n as git_init:
+        git -c init.defaultBranch=master init -q
+        git -c user.name=test -c user.email=test commit -q --allow-empty -m 'initial commit'
+        cp "${scripts.path}/cancel.yaml" minici.yaml
+        git add minici.yaml
+        git -c user.name=test -c user.email=test commit -q -m 'minici.yaml'
+        git rev-parse HEAD
+
+        touch a
+        git add a
+        git -c user.name=test -c user.email=test commit -q -m a
+        git rev-parse HEAD
+        git rev-parse HEAD^{tree}
+
+        touch b
+        git add b
+        git -c user.name=test -c user.email=test commit -q -m b
+        git rev-parse HEAD
+        git rev-parse HEAD^{tree}
+
+        touch c
+        git add c
+        git -c user.name=test -c user.email=test commit -q -m c
+        git rev-parse HEAD
+        git rev-parse HEAD^{tree}
+
+        touch d
+        git add d
+        git -c user.name=test -c user.email=test commit -q -m d
+        git rev-parse HEAD
+        git rev-parse HEAD^{tree}
+
+        git reset --hard HEAD~4
+        git rev-parse HEAD
+
+    expect /([0-9a-f]+)/ from git_init capture c_init
+    expect /([0-9a-f]+)/ from git_init capture ca
+    expect /([0-9a-f]+)/ from git_init capture ta
+    expect /([0-9a-f]+)/ from git_init capture cb
+    expect /([0-9a-f]+)/ from git_init capture tb
+    expect /([0-9a-f]+)/ from git_init capture cc
+    expect /([0-9a-f]+)/ from git_init capture tc
+    expect /([0-9a-f]+)/ from git_init capture cd
+    expect /([0-9a-f]+)/ from git_init capture td
+    expect /([0-9a-f]+)/ from git_init capture c_end
+
+    guard (c_init == c_end)
+
+    local:
+        spawn on n as p args [ "--jobs=20", "run", "--new-commits-on=master" ] killwith SIGINT
+        expect from p /watch-branch-started master/
+
+        shell on n:
+            git reset --hard $ca
+
+        expect from p:
+            /job-enqueue $ta.first/
+            /job-enqueue $ta.second/
+            /job-enqueue $ta.third/
+            /job-start $ta.first/
+            /job-start $ta.third/
+            /job-finish $ta.third done/
+
+        shell on n:
+            git reset --hard $cc
+
+        expect from p:
+            /job-enqueue $tb.first/
+            /job-enqueue $tb.second/
+            /job-enqueue $tb.third/
+            /job-enqueue $tc.first/
+            /job-enqueue $tc.second/
+            /job-enqueue $tc.third/
+            /job-start $tb.first/
+            /job-start $tb.third/
+            /job-start $tc.first/
+            /job-start $tc.third/
+            /job-finish $tb.third done/
+            /job-finish $tc.third done/
+
+        shell on n:
+            git reset --hard $ca
+
+        expect from p:
+            /job-finish $tb.first cancelled/
+            /job-finish $tb.second cancelled/
+            /job-finish $tc.first cancelled/
+            /job-finish $tc.second cancelled/
+
+        shell on n:
+            git reset --hard $cb
+
+        expect from p:
+            /job-enqueue $tb.first/
+            /job-enqueue $tb.second/
+            /job-duplicate $tb.third done/
+            /job-start $tb.first/
+
+        shell on n:
+            git reset --hard $ca
+
+        expect from p:
+            /job-finish $tb.first cancelled/
+            /job-finish $tb.second cancelled/
+
+        shell on n:
+            git reset --hard $cd
+
+        expect from p:
+            /job-enqueue $tb.first/
+            /job-enqueue $tb.second/
+            /job-duplicate $tb.third done/
+            /job-start $tb.first/
+
+            /job-enqueue $tc.first/
+            /job-enqueue $tc.second/
+            /job-duplicate $tc.third done/
+            /job-start $tc.first/
+
+            /job-enqueue $td.first/
+            /job-enqueue $td.second/
+            /job-enqueue $td.third/
+            /job-start $td.first/
+            /job-start $td.third/
+            /job-(.*)/ capture final_job
+        guard (final_job == "finish $td.third done")