svn commit: r1181572 - in /hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/master: HMaster.java RegionManager.java

[ns...@apache.org]

Author: nspiegelberg
Date: Tue Oct 11 02:21:32 2011
New Revision: 1181572

URL: http://svn.apache.org/viewvc?rev=1181572&view=rev
Log:
Assign regions based on locality even not a fresh restart

Summary:
If the cluster is not a fresh restart, we may still need to assign regions
based on the locality for the first period of time.

Test Plan:
test on dev cluster

Reviewed By: kannan
Reviewers: kannan, nspiegelberg
CC: hbase@lists, gqchen, kannan
Differential Revision: 270788

Modified:
    hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
    hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/master/RegionManager.java

Modified: hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/master/HMaster.java?rev=1181572&r1=1181571&r2=1181572&view=diff
==============================================================================
--- hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/master/HMaster.java (original)
+++ hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/master/HMaster.java Tue Oct 11 02:21:32 2011
@@ -292,7 +292,7 @@ public class HMaster extends Thread impl
           1 * 60 * 1000);
 
     // disable scanning dfs by setting applyPreferredAssignmentPeriod to 0
-    if (isClusterStartup && applyPreferredAssignmentPeriod > 0) {
+    if (applyPreferredAssignmentPeriod > 0) {
       try {
         LOG.debug("get preferredRegionToHostMapping; expecting pause here");
         this.preferredRegionToRegionServerMapping =

Modified: hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/master/RegionManager.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/master/RegionManager.java?rev=1181572&r1=1181571&r2=1181572&view=diff
==============================================================================
--- hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/master/RegionManager.java (original)
+++ hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/master/RegionManager.java Tue Oct 11 02:21:32 2011
@@ -239,7 +239,6 @@ public class RegionManager {
         - this.master.getMasterStartupTime();
     boolean assignmentByLocality = ((masterRunningTime < this.master
         .getApplyPreferredAssignmentPeriod()) &&
-        this.master.isClusterStartup() &&
         this.master.getPreferredRegionToRegionServerMapping() != null) ?
         true : false;