Fix Prevent false positive resumable task

Signed-off-by: Paolo Di Tommaso <[email protected]>
nextflow-io · Sep 25, 2023 · aae8771 · aae8771
1 parent c4cd53c
commit aae8771
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 2 deletions.
diff --git a/modules/nextflow/src/main/groovy/nextflow/processor/TaskProcessor.groovy b/modules/nextflow/src/main/groovy/nextflow/processor/TaskProcessor.groovy
@@ -767,13 +767,13 @@ class TaskProcessor {
             Path resumeDir = null
             boolean exists = false
             try {
-                def entry = session.cache.getTaskEntry(hash, this)
+                final entry = session.cache.getTaskEntry(hash, this)
                 resumeDir = entry ? FileHelper.asPath(entry.trace.getWorkDir()) : null
                 if( resumeDir )
                     exists = resumeDir.exists()
 
                 log.trace "[${safeTaskName(task)}] Cacheable folder=${resumeDir?.toUriString()} -- exists=$exists; try=$tries; shouldTryCache=$shouldTryCache; entry=$entry"
-                def cached = shouldTryCache && exists && checkCachedOutput(task.clone(), resumeDir, hash, entry)
+                final cached = shouldTryCache && exists && entry.trace.isCompleted() && checkCachedOutput(task.clone(), resumeDir, hash, entry)
                 if( cached )
                     break
             }

diff --git a/modules/nextflow/src/main/groovy/nextflow/trace/TraceRecord.groovy b/modules/nextflow/src/main/groovy/nextflow/trace/TraceRecord.groovy
@@ -583,6 +583,10 @@ class TraceRecord implements Serializable {
         store.status == 'CACHED'
     }
 
+    boolean isCompleted() {
+        store.status == 'COMPLETED'
+    }
+
     String getExecutorName() {
         return executorName
     }

diff --git a/modules/nextflow/src/test/groovy/nextflow/trace/TraceRecordTest.groovy b/modules/nextflow/src/test/groovy/nextflow/trace/TraceRecordTest.groovy
@@ -18,6 +18,7 @@ package nextflow.trace
 
 import groovy.json.JsonSlurper
 import spock.lang.Specification
+import spock.lang.Unroll
 import test.TestHelper
 
 /**
@@ -300,4 +301,36 @@ class TraceRecordTest extends Specification {
         rec.env == 'aws_key=[secure]'
     }
 
+    @Unroll
+    def 'should validate cached status' () {
+        given:
+        def rec = new TraceRecord([status:STATUS])
+
+        expect:
+        rec.isCached() == EXPECTED
+
+        where:
+        STATUS      | EXPECTED
+        null        | false
+        'NEW'       | false
+        'ABORTED'   | false
+        'CACHED'    | true
+    }
+
+    @Unroll
+    def 'should validate completed status' () {
+        given:
+        def rec = new TraceRecord([status:STATUS])
+
+        expect:
+        rec.isCompleted() == EXPECTED
+
+        where:
+        STATUS      | EXPECTED
+        null        | false
+        'NEW'       | false
+        'ABORTED'   | false
+        'COMPLETED' | true
+    }
+
 }