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

Posted to commits@hbase.apache.org by ra...@apache.org on 2012/08/24 20:34:10 UTC

svn commit: r1377024 - /hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/HMaster.java

Author: ramkrishna
Date: Fri Aug 24 18:34:10 2012
New Revision: 1377024

URL: http://svn.apache.org/viewvc?rev=1377024&view=rev
Log:
HBASE-6437 Avoid admin.balance during master initialize

Submitted by:rajesh
Reviewed by:Ted	

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

Modified: hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/HMaster.java?rev=1377024&r1=1377023&r2=1377024&view=diff
==============================================================================
--- hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/HMaster.java (original)
+++ hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/HMaster.java Fri Aug 24 18:34:10 2012
@@ -928,6 +928,11 @@ Server {
 
   @Override
   public boolean balance() {
+    // if master not initialized, don't run balancer.
+    if (!this.initialized) {
+      LOG.debug("Master has not been initialized, don't run balancer.");
+      return false;
+    }
     // If balance not true, don't run balancer.
     if (!this.balanceSwitch) return false;
     // Do this call outside of synchronized block.