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/13 02:38:45 UTC
svn commit: r1361018 -
/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
Author: larsh
Date: Fri Jul 13 00:38:45 2012
New Revision: 1361018
URL: http://svn.apache.org/viewvc?rev=1361018&view=rev
Log:
HBASE-6375 Master may be using a stale list of region servers for creating assignment plan during startup (Aditya Kishore)
Modified:
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java?rev=1361018&r1=1361017&r2=1361018&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java (original)
+++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java Fri Jul 13 00:38:45 2012
@@ -2247,15 +2247,6 @@ public class AssignmentManager extends Z
* @throws IOException
*/
public void assignAllUserRegions() throws IOException, InterruptedException {
- // Get all available servers
- List<ServerName> servers = serverManager.getOnlineServersList();
-
- // Remove the deadNotExpired servers from the server list.
- removeDeadNotExpiredServers(servers);
-
- // If there are no servers we need not proceed with region assignment.
- if(servers.isEmpty()) return;
-
// Skip assignment for regions of tables in DISABLING state also because
// during clean cluster startup no RS is alive and regions map also doesn't
// have any information about the regions. See HBASE-6281.
@@ -2266,6 +2257,15 @@ public class AssignmentManager extends Z
disablingAndDisabledTables, true);
if (allRegions == null || allRegions.isEmpty()) return;
+ // Get all available servers
+ List<ServerName> servers = serverManager.getOnlineServersList();
+
+ // Remove the deadNotExpired servers from the server list.
+ removeDeadNotExpiredServers(servers);
+
+ // If there are no servers we need not proceed with region assignment.
+ if(servers.isEmpty()) return;
+
// Determine what type of assignment to do on startup
boolean retainAssignment = master.getConfiguration().
getBoolean("hbase.master.startup.retainassign", true);