You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@hbase.apache.org by te...@apache.org on 2012/09/18 15:53:06 UTC

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

Author: tedyu
Date: Tue Sep 18 13:53:05 2012
New Revision: 1387164

URL: http://svn.apache.org/viewvc?rev=1387164&view=rev
Log:
HBASE-6438 Addendum checks regionAlreadyInTransitionException when generating region plan (Chunhui)


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

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java?rev=1387164&r1=1387163&r2=1387164&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java Tue Sep 18 13:53:05 2012
@@ -1569,7 +1569,7 @@ public class AssignmentManager extends Z
         LOG.debug("Server stopped; skipping assign of " + state);
         return;
       }
-      RegionPlan plan = getRegionPlan(state, forceNewPlan);
+      RegionPlan plan = getRegionPlan(state, !regionAlreadyInTransitionException && forceNewPlan);
       if (plan == null) {
         LOG.debug("Unable to determine a plan to assign " + state);
         this.timeoutMonitor.setAllRegionServersOffline(true);