Mark job failed instead of killed (#1092)

Co-authored-by: Andrew Nguyen <andrewn@netflix.com>
Netflix · Mar 31, 2021 · cbef9ee · cbef9ee
1 parent c478d9a
commit cbef9ee
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/...t/src/main/java/com/netflix/genie/agent/execution/process/impl/JobProcessManagerImpl.java b/...t/src/main/java/com/netflix/genie/agent/execution/process/impl/JobProcessManagerImpl.java
@@ -264,7 +264,7 @@ public JobProcessResult waitFor() throws InterruptedException {
                 case SYSTEM_SIGNAL:
                     // In interactive mode, killed by a system signal is mostly likely by a user (e.g. Ctrl-C)
                     return new JobProcessResult
-                        .Builder(JobStatus.KILLED,
+                        .Builder(JobStatus.FAILED,
                         this.isInteractiveMode
                             ? JobStatusMessages.JOB_KILLED_BY_USER
                             : JobStatusMessages.JOB_KILLED_BY_SYSTEM,

diff --git a/...st/groovy/com/netflix/genie/agent/execution/process/impl/JobProcessManagerImplSpec.groovy b/...st/groovy/com/netflix/genie/agent/execution/process/impl/JobProcessManagerImplSpec.groovy
@@ -381,7 +381,6 @@ class JobProcessManagerImplSpec extends Specification {
         KillService.KillSource.TIMEOUT               | JobStatusMessages.JOB_EXCEEDED_TIMEOUT
         KillService.KillSource.FILES_LIMIT           | JobStatusMessages.JOB_EXCEEDED_FILES_LIMIT
         KillService.KillSource.API_KILL_REQUEST      | JobStatusMessages.JOB_KILLED_BY_USER
-        KillService.KillSource.SYSTEM_SIGNAL         | JobStatusMessages.JOB_KILLED_BY_USER
         KillService.KillSource.REMOTE_STATUS_MONITOR | JobStatusMessages.JOB_MARKED_FAILED
     }
 
@@ -414,7 +413,7 @@ class JobProcessManagerImplSpec extends Specification {
         JobProcessResult result = this.manager.waitFor()
 
         then:
-        result.getFinalStatus() == JobStatus.KILLED
+        result.getFinalStatus() == JobStatus.FAILED
         result.getFinalStatusMessage() == expectedStatusMessage
         result.getStdOutSize() == 0L
         result.getStdErrSize() == 0L