Added Zombie and Cleaning Scan states

core/src/main/java/org/apache/accumulo/core/client/admin/ScanState.java

@@ -34,5 +34,19 @@ public enum ScanState {
    * Indicates a task is queued in a server side thread pool to fetch the next bach of key/values
    * for a scan.
    */
-  QUEUED
+  QUEUED,
+
+  /**
+   * Indicate the session is no longer accessible and is in the process of cleaning up resources
+   *
+   * @since 3.1.0
+   */
+  CLEANING,
+  /**
+   * Indicate the client session is no longer accessible and still has a thread running on the
+   * server side
+   *
+   * @since 3.1.0
+   */
+  ZOMBIE
 }

core/src/main/thrift/tabletscan.thrift

@@ -49,6 +49,8 @@ enum ScanState {
   IDLE
   RUNNING
   QUEUED
+  ZOMBIE
+  CLEANING
 }
 
 struct ActiveScan {

server/tserver/src/main/java/org/apache/accumulo/tserver/session/SessionManager.java

@@ -458,34 +458,37 @@ public List<ActiveScan> getActiveScans() {
         addActiveScan(activeScans, scanSession,
             isSingle ? ((SingleScanSession) scanSession).extent
                 : ((MultiScanSession) scanSession).threadPoolExtent,
-            ct, isSingle ? ScanType.SINGLE : ScanType.BATCH,
-            computeScanState(scanSession.getScanTask()), scanSession.scanParams, entry.getKey());
+            ct, isSingle ? ScanType.SINGLE : ScanType.BATCH, computeScanState(scanSession),
+            scanSession.scanParams, entry.getKey());
       }
     }));
 
     return activeScans;
   }
 
-  private ScanState computeScanState(ScanTask<?> scanTask) {
+  private ScanState computeScanState(ScanSession<?> session) {
     ScanState state = ScanState.RUNNING;
 
-    if (scanTask == null) {
-      state = ScanState.IDLE;
+    if (session.getState() == State.REMOVED) {
+      state = ScanState.CLEANING;
     } else {
-      switch (scanTask.getScanRunState()) {
+      switch (session.getScanTask().getScanRunState()) {
         case QUEUED:
           state = ScanState.QUEUED;
           break;
         case FINISHED:
           state = ScanState.IDLE;
           break;
         case RUNNING:
+          if (session.getState() == State.REMOVED) {
+            state = ScanState.ZOMBIE;
+          }
+          break;
         default:
           /* do nothing */
           break;
       }
     }
-
     return state;
   }