You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by la...@apache.org on 2012/07/05 19:36:59 UTC

svn commit: r1357757 - /hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java

Author: larsh
Date: Thu Jul  5 17:36:59 2012
New Revision: 1357757

URL: http://svn.apache.org/viewvc?rev=1357757&view=rev
Log:
HBASE-6293 HMaster does not go down while splitting logs even if explicit shutdown is called.

Modified:
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java?rev=1357757&r1=1357756&r2=1357757&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java Thu Jul  5 17:36:59 2012
@@ -193,6 +193,10 @@ public class MasterFileSystem {
         HLog.SPLIT_SKIP_ERRORS_DEFAULT);
     Path logsDirPath = new Path(this.rootdir, HConstants.HREGION_LOGDIR_NAME);
     do {
+      if (master.isStopped()) {
+        LOG.warn("Master stopped while splitting logs");
+        break;
+      }
       List<ServerName> serverNames = new ArrayList<ServerName>();
       try {
         if (!this.fs.exists(logsDirPath)) return;