hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zjus...@apache.org
Subject svn commit: r1553246 - /hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Date Tue, 24 Dec 2013 05:57:02 GMT
Author: zjushch
Date: Tue Dec 24 05:57:02 2013
New Revision: 1553246

URL: http://svn.apache.org/r1553246
Log:
HBASE-10214 Regionserver shutdown improperly and leaves the dir in .old not deleted(binlijin)

Modified:
    hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java

Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1553246&r1=1553245&r2=1553246&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
(original)
+++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Tue Dec 24 05:57:02 2013
@@ -146,7 +146,6 @@ import org.apache.hadoop.hbase.regionser
 import org.apache.hadoop.hbase.regionserver.wal.FailedLogCloseException;
 import org.apache.hadoop.hbase.regionserver.wal.HLog;
 import org.apache.hadoop.hbase.regionserver.wal.WALActionsListener;
-import org.apache.hadoop.hbase.security.User;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.util.CompressionTest;
 import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
@@ -927,6 +926,10 @@ public class HRegionServer implements HR
 
   void tryRegionServerReport()
   throws IOException {
+    if (!keepLooping() && hbaseMaster == null) {
+      // the current server is stopping
+      return;
+    }
     HServerLoad hsl = buildServerLoad();
     // Why we do this?
     this.requestCount.set(0);



Mime
View raw message