accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1438672 - in /accumulo/trunk/server: ./ src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
Date Fri, 25 Jan 2013 19:55:11 GMT
Author: ecn
Date: Fri Jan 25 19:55:11 2013
New Revision: 1438672

URL: http://svn.apache.org/viewvc?rev=1438672&view=rev
Log:
ACCUMUL-909 merge to trunk

Modified:
    accumulo/trunk/server/   (props changed)
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java

Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/server:r1438669
  Merged /accumulo/branches/1.4/src/server:r1438669

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java?rev=1438672&r1=1438671&r2=1438672&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
(original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
Fri Jan 25 19:55:11 2013
@@ -924,11 +924,12 @@ public class TabletServer extends Abstra
         String oldThreadName = Thread.currentThread().getName();
         
         try {
-          runState.set(ScanRunState.RUNNING);
-          
           if (isCancelled() || scanSession == null)
             return;
           
+          
+          runState.set(ScanRunState.RUNNING);
+          
           Thread.currentThread().setName(
               "User: " + scanSession.user + " Start: " + scanSession.startTime + " Client:
" + scanSession.client + " Tablet: " + scanSession.extent);
           
@@ -960,7 +961,7 @@ public class TabletServer extends Abstra
         } catch (TooManyFilesException tmfe) {
           addResult(tmfe);
         } catch (Throwable e) {
-          log.warn("exception while scanning tablet " + scanSession.extent, e);
+          log.warn("exception while scanning tablet " + (scanSession == null ? "(unknown)"
: scanSession.extent), e);
           addResult(e);
         } finally {
           runState.set(ScanRunState.FINISHED);



Mime
View raw message