Add stopping status to task (#3868)

* stopping * fix
microsoft · Nov 20, 2019 · 2dc2411 · 2dc2411
1 parent 788ec67
commit 2dc2411
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/src/rest-server/src/models/v2/job/k8s.js b/src/rest-server/src/models/v2/job/k8s.js
@@ -93,10 +93,15 @@ const convertState = (state, exitCode, retryDelaySec) => {
     case 'AttemptPreparing':
       return 'WAITING';
     case 'AttemptRunning':
+      return 'RUNNING';
     case 'AttemptDeletionPending':
     case 'AttemptDeletionRequested':
     case 'AttemptDeleting':
-      return 'RUNNING';
+      if (exitCode === -210 || exitCode === -220) {
+        return 'STOPPING';
+      } else {
+        return 'RUNNING';
+      }
     case 'AttemptCompleted':
       if (retryDelaySec == null) {
         return 'RUNNING';

diff --git a/src/webportal/src/app/components/util/job.js b/src/webportal/src/app/components/util/job.js
@@ -49,6 +49,8 @@ export function getHumanizedJobStateString(job) {
     return 'Failed';
   } else if (job.state === 'STOPPED') {
     return 'Stopped';
+  } else if (job.state === 'STOPPING') {
+    return 'Stopping';
   } else {
     return 'Unknown';
   }

diff --git a/src/webportal/src/app/job/job-view/fabric/job-detail/components/task-role.jsx b/src/webportal/src/app/job/job-view/fabric/job-detail/components/task-role.jsx
@@ -48,6 +48,7 @@ const TaskRoleCount = ({ taskInfo }) => {
           count.running += 1;
           break;
         case 'WAITING':
+        case 'STOPPING':
           count.waiting += 1;
           break;
         case 'SUCCEEDED':