svn commit: r1183049 - /incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/master/Master.java

[ec...@apache.org]

Author: ecn
Date: Thu Oct 13 19:32:30 2011
New Revision: 1183049

URL: http://svn.apache.org/viewvc?rev=1183049&view=rev
Log:
ACCUMULO-36: wait for the root tablet to be unloaded before shutting down

Modified:
    incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/master/Master.java

Modified: incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/master/Master.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/master/Master.java?rev=1183049&r1=1183048&r2=1183049&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/master/Master.java (original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/master/Master.java Thu Oct 13 19:32:30 2011
@@ -1361,7 +1361,7 @@ public class Master implements Listener,
                                 setMasterState(MasterState.UNLOAD_ROOT_TABLET);
                             break;
                         case UNLOAD_ROOT_TABLET:
-                            count = nonMetaDataTabletsAssignedOrHosted();
+                            count = assignedOrHosted(METADATA_TABLE_ID);
                             if (count > 0)
                                 log.debug(String.format("The root tablet is still assigned or hosted"));
                             Set<TServerInstance> currentServers = tserverSet.getCurrentServers();
@@ -1396,9 +1396,9 @@ public class Master implements Listener,
 
             if (badServers.size() > 0) {
                 log.debug("not balancing because the balance information is out-of-date");
-            } if (notHosted() > 0) {
+            } else if (notHosted() > 0) {
                 log.debug("not balancing because there are unhosted tablets");
-            } if (getMasterGoalState() == MasterGoalState.CLEAN_STOP) {
+            } else if (getMasterGoalState() == MasterGoalState.CLEAN_STOP) {
                 log.debug("not balancing because the master is attempting to stop cleanly");
             } else {
             	balanceLoggers();