Merge branch '2.1' into 3.1

Author: keith-turner

server/tserver/src/main/java/org/apache/accumulo/tserver/scan/LookupTask.java

@@ -64,15 +64,16 @@ public void run() {
     MultiScanSession session = (MultiScanSession) server.getSession(scanID);
     String oldThreadName = Thread.currentThread().getName();
 
+    if (!transitionToRunning()) {
+      return;
+    }
+    // Do not add any code here. Need to ensure that transitionFromRunning() runs in the finally
+    // block when transitionToRunning() returns true.
     try {
       if (isCancelled() || session == null) {
         return;
       }
 
-      if (!transitionToRunning()) {
-        return;
-      }
-
       TableConfiguration acuTableConf = server.getTableConfiguration(session.threadPoolExtent);
       long maxResultsSize = acuTableConf.getAsBytes(Property.TABLE_SCAN_MAXMEM);
 

server/tserver/src/main/java/org/apache/accumulo/tserver/scan/NextBatchTask.java

@@ -54,15 +54,16 @@ public void run() {
     final SingleScanSession scanSession = (SingleScanSession) server.getSession(scanID);
     String oldThreadName = Thread.currentThread().getName();
 
+    if (!transitionToRunning()) {
+      return;
+    }
+    // Do not add any code here. Need to ensure that transitionFromRunning() runs in the finally
+    // block when transitionToRunning() returns true.
     try {
       if (isCancelled() || scanSession == null) {
         return;
       }
 
-      if (!transitionToRunning()) {
-        return;
-      }
-
       Thread.currentThread()
           .setName("User: " + scanSession.getUser() + " Start: " + scanSession.startTime
               + " Client: " + scanSession.client + " Tablet: " + scanSession.extent);