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:39:02 UTC
svn commit: r1357759 -
/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java
Author: larsh
Date: Thu Jul 5 17:39:01 2012
New Revision: 1357759
URL: http://svn.apache.org/viewvc?rev=1357759&view=rev
Log:
HBASE-6293 HMaster does not go down while splitting logs even if explicit shutdown is called.
Modified:
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java
Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java?rev=1357759&r1=1357758&r2=1357759&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java (original)
+++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java Thu Jul 5 17:39:01 2012
@@ -189,6 +189,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;