You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2011/06/08 18:36:53 UTC
svn commit: r1133459 - in /hbase/trunk: CHANGES.txt
src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
Author: stack
Date: Wed Jun 8 16:36:53 2011
New Revision: 1133459
URL: http://svn.apache.org/viewvc?rev=1133459&view=rev
Log:
HBASE-3946 The splitted region can be online again while the standby hmaster becomes the active one
Modified:
hbase/trunk/CHANGES.txt
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1133459&r1=1133458&r2=1133459&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Wed Jun 8 16:36:53 2011
@@ -308,6 +308,8 @@ Release 0.90.4 - Unreleased
the same time (Jieshan Bean)
HBASE-3934 MemStoreFlusher.getMemStoreLimit() doesn't honor defaultLimit
(Ted Yu)
+ HBASE-3946 The splitted region can be online again while the standby
+ hmaster becomes the active one (Jieshan Bean)
IMPROVEMENT
HBASE-3882 hbase-config.sh needs to be updated so it can auto-detects the
Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java?rev=1133459&r1=1133458&r2=1133459&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java Wed Jun 8 16:36:53 2011
@@ -1687,14 +1687,17 @@ public class AssignmentManager extends Z
Result result = region.getSecond();
// If region was in transition (was in zk) force it offline for reassign
try {
- ZKAssign.createOrForceNodeOffline(watcher, regionInfo,
- this.master.getServerName());
+ // Process with existing RS shutdown code
+ boolean isNotDisabledAndSplitted =
+ ServerShutdownHandler.processDeadRegion(regionInfo, result, this,
+ this.catalogTracker);
+ if (isNotDisabledAndSplitted) {
+ ZKAssign.createOrForceNodeOffline(watcher, regionInfo,
+ master.getServerName());
+ }
} catch (KeeperException.NoNodeException nne) {
// This is fine
}
- // Process with existing RS shutdown code
- ServerShutdownHandler.processDeadRegion(regionInfo, result, this,
- this.catalogTracker);
}
}
}