http://git-wip-us.apache.org/repos/asf/hbase-site/blob/554d61c6/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegionServer.CompactionChecker.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegionServer.CompactionChecker.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegionServer.CompactionChecker.html
index 802fc2f..2bbae5e 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegionServer.CompactionChecker.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegionServer.CompactionChecker.html
@@ -458,7 +458,7 @@
 <span class="sourceLineNo">450</span>  /**<a name="line.450"></a>
 <span class="sourceLineNo">451</span>   * Unique identifier for the cluster we 
are a part of.<a name="line.451"></a>
 <span class="sourceLineNo">452</span>   */<a name="line.452"></a>
-<span class="sourceLineNo">453</span>  private String clusterId;<a 
name="line.453"></a>
+<span class="sourceLineNo">453</span>  protected String clusterId;<a 
name="line.453"></a>
 <span class="sourceLineNo">454</span><a name="line.454"></a>
 <span class="sourceLineNo">455</span>  /**<a name="line.455"></a>
 <span class="sourceLineNo">456</span>   * MX Bean for RegionServerInfo<a 
name="line.456"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/554d61c6/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegionServer.MovedRegionInfo.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegionServer.MovedRegionInfo.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegionServer.MovedRegionInfo.html
index 802fc2f..2bbae5e 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegionServer.MovedRegionInfo.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegionServer.MovedRegionInfo.html
@@ -458,7 +458,7 @@
 <span class="sourceLineNo">450</span>  /**<a name="line.450"></a>
 <span class="sourceLineNo">451</span>   * Unique identifier for the cluster we 
are a part of.<a name="line.451"></a>
 <span class="sourceLineNo">452</span>   */<a name="line.452"></a>
-<span class="sourceLineNo">453</span>  private String clusterId;<a 
name="line.453"></a>
+<span class="sourceLineNo">453</span>  protected String clusterId;<a 
name="line.453"></a>
 <span class="sourceLineNo">454</span><a name="line.454"></a>
 <span class="sourceLineNo">455</span>  /**<a name="line.455"></a>
 <span class="sourceLineNo">456</span>   * MX Bean for RegionServerInfo<a 
name="line.456"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/554d61c6/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegionServer.MovedRegionsCleaner.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegionServer.MovedRegionsCleaner.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegionServer.MovedRegionsCleaner.html
index 802fc2f..2bbae5e 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegionServer.MovedRegionsCleaner.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegionServer.MovedRegionsCleaner.html
@@ -458,7 +458,7 @@
 <span class="sourceLineNo">450</span>  /**<a name="line.450"></a>
 <span class="sourceLineNo">451</span>   * Unique identifier for the cluster we 
are a part of.<a name="line.451"></a>
 <span class="sourceLineNo">452</span>   */<a name="line.452"></a>
-<span class="sourceLineNo">453</span>  private String clusterId;<a 
name="line.453"></a>
+<span class="sourceLineNo">453</span>  protected String clusterId;<a 
name="line.453"></a>
 <span class="sourceLineNo">454</span><a name="line.454"></a>
 <span class="sourceLineNo">455</span>  /**<a name="line.455"></a>
 <span class="sourceLineNo">456</span>   * MX Bean for RegionServerInfo<a 
name="line.456"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/554d61c6/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegionServer.PeriodicMemStoreFlusher.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegionServer.PeriodicMemStoreFlusher.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegionServer.PeriodicMemStoreFlusher.html
index 802fc2f..2bbae5e 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegionServer.PeriodicMemStoreFlusher.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegionServer.PeriodicMemStoreFlusher.html
@@ -458,7 +458,7 @@
 <span class="sourceLineNo">450</span>  /**<a name="line.450"></a>
 <span class="sourceLineNo">451</span>   * Unique identifier for the cluster we 
are a part of.<a name="line.451"></a>
 <span class="sourceLineNo">452</span>   */<a name="line.452"></a>
-<span class="sourceLineNo">453</span>  private String clusterId;<a 
name="line.453"></a>
+<span class="sourceLineNo">453</span>  protected String clusterId;<a 
name="line.453"></a>
 <span class="sourceLineNo">454</span><a name="line.454"></a>
 <span class="sourceLineNo">455</span>  /**<a name="line.455"></a>
 <span class="sourceLineNo">456</span>   * MX Bean for RegionServerInfo<a 
name="line.456"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/554d61c6/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegionServer.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegionServer.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegionServer.html
index 802fc2f..2bbae5e 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegionServer.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegionServer.html
@@ -458,7 +458,7 @@
 <span class="sourceLineNo">450</span>  /**<a name="line.450"></a>
 <span class="sourceLineNo">451</span>   * Unique identifier for the cluster we 
are a part of.<a name="line.451"></a>
 <span class="sourceLineNo">452</span>   */<a name="line.452"></a>
-<span class="sourceLineNo">453</span>  private String clusterId;<a 
name="line.453"></a>
+<span class="sourceLineNo">453</span>  protected String clusterId;<a 
name="line.453"></a>
 <span class="sourceLineNo">454</span><a name="line.454"></a>
 <span class="sourceLineNo">455</span>  /**<a name="line.455"></a>
 <span class="sourceLineNo">456</span>   * MX Bean for RegionServerInfo<a 
name="line.456"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/554d61c6/devapidocs/src-html/org/apache/hadoop/hbase/rsgroup/RSGroupBasedLoadBalancer.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/rsgroup/RSGroupBasedLoadBalancer.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/rsgroup/RSGroupBasedLoadBalancer.html
index d77ee16..1451196 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/rsgroup/RSGroupBasedLoadBalancer.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/rsgroup/RSGroupBasedLoadBalancer.html
@@ -309,134 +309,141 @@
 <span class="sourceLineNo">301</span>    return finalList;<a 
name="line.301"></a>
 <span class="sourceLineNo">302</span>  }<a name="line.302"></a>
 <span class="sourceLineNo">303</span><a name="line.303"></a>
-<span class="sourceLineNo">304</span>  private Set&lt;RegionInfo&gt; 
getMisplacedRegions(<a name="line.304"></a>
-<span class="sourceLineNo">305</span>      Map&lt;RegionInfo, ServerName&gt; 
regions) throws IOException {<a name="line.305"></a>
-<span class="sourceLineNo">306</span>    Set&lt;RegionInfo&gt; 
misplacedRegions = new HashSet&lt;&gt;();<a name="line.306"></a>
-<span class="sourceLineNo">307</span>    for(Map.Entry&lt;RegionInfo, 
ServerName&gt; region : regions.entrySet()) {<a name="line.307"></a>
-<span class="sourceLineNo">308</span>      RegionInfo regionInfo = 
region.getKey();<a name="line.308"></a>
-<span class="sourceLineNo">309</span>      ServerName assignedServer = 
region.getValue();<a name="line.309"></a>
-<span class="sourceLineNo">310</span>      RSGroupInfo info = 
rsGroupInfoManager.getRSGroup(rsGroupInfoManager.<a name="line.310"></a>
-<span class="sourceLineNo">311</span>              
getRSGroupOfTable(regionInfo.getTable()));<a name="line.311"></a>
-<span class="sourceLineNo">312</span>      if (assignedServer != null 
&amp;&amp;<a name="line.312"></a>
-<span class="sourceLineNo">313</span>          (info == null || 
!info.containsServer(assignedServer.getAddress()))) {<a name="line.313"></a>
-<span class="sourceLineNo">314</span>        RSGroupInfo otherInfo = null;<a 
name="line.314"></a>
-<span class="sourceLineNo">315</span>        otherInfo = 
rsGroupInfoManager.getRSGroupOfServer(assignedServer.getAddress());<a 
name="line.315"></a>
-<span class="sourceLineNo">316</span>        LOG.debug("Found misplaced 
region: " + regionInfo.getRegionNameAsString() +<a name="line.316"></a>
-<span class="sourceLineNo">317</span>            " on server: " + 
assignedServer +<a name="line.317"></a>
-<span class="sourceLineNo">318</span>            " found in group: " +  
otherInfo +<a name="line.318"></a>
-<span class="sourceLineNo">319</span>            " outside of group: " + (info 
== null ? "UNKNOWN" : info.getName()));<a name="line.319"></a>
-<span class="sourceLineNo">320</span>        
misplacedRegions.add(regionInfo);<a name="line.320"></a>
+<span class="sourceLineNo">304</span>  @VisibleForTesting<a 
name="line.304"></a>
+<span class="sourceLineNo">305</span>  public Set&lt;RegionInfo&gt; 
getMisplacedRegions(<a name="line.305"></a>
+<span class="sourceLineNo">306</span>      Map&lt;RegionInfo, ServerName&gt; 
regions) throws IOException {<a name="line.306"></a>
+<span class="sourceLineNo">307</span>    Set&lt;RegionInfo&gt; 
misplacedRegions = new HashSet&lt;&gt;();<a name="line.307"></a>
+<span class="sourceLineNo">308</span>    for(Map.Entry&lt;RegionInfo, 
ServerName&gt; region : regions.entrySet()) {<a name="line.308"></a>
+<span class="sourceLineNo">309</span>      RegionInfo regionInfo = 
region.getKey();<a name="line.309"></a>
+<span class="sourceLineNo">310</span>      ServerName assignedServer = 
region.getValue();<a name="line.310"></a>
+<span class="sourceLineNo">311</span>      RSGroupInfo info = 
rsGroupInfoManager.getRSGroup(rsGroupInfoManager.<a name="line.311"></a>
+<span class="sourceLineNo">312</span>              
getRSGroupOfTable(regionInfo.getTable()));<a name="line.312"></a>
+<span class="sourceLineNo">313</span>      if (assignedServer == null) {<a 
name="line.313"></a>
+<span class="sourceLineNo">314</span>        LOG.debug("There is no assigned 
server for {}", region);<a name="line.314"></a>
+<span class="sourceLineNo">315</span>        continue;<a name="line.315"></a>
+<span class="sourceLineNo">316</span>      }<a name="line.316"></a>
+<span class="sourceLineNo">317</span>      RSGroupInfo otherInfo = 
rsGroupInfoManager.getRSGroupOfServer(assignedServer.getAddress());<a 
name="line.317"></a>
+<span class="sourceLineNo">318</span>      if (info == null &amp;&amp; 
otherInfo == null) {<a name="line.318"></a>
+<span class="sourceLineNo">319</span>        LOG.warn("Couldn't obtain rs 
group information for {} on {}", region, assignedServer);<a name="line.319"></a>
+<span class="sourceLineNo">320</span>        continue;<a name="line.320"></a>
 <span class="sourceLineNo">321</span>      }<a name="line.321"></a>
-<span class="sourceLineNo">322</span>    }<a name="line.322"></a>
-<span class="sourceLineNo">323</span>    return misplacedRegions;<a 
name="line.323"></a>
-<span class="sourceLineNo">324</span>  }<a name="line.324"></a>
-<span class="sourceLineNo">325</span><a name="line.325"></a>
-<span class="sourceLineNo">326</span>  private ServerName 
findServerForRegion(<a name="line.326"></a>
-<span class="sourceLineNo">327</span>      Map&lt;ServerName, 
List&lt;RegionInfo&gt;&gt; existingAssignments, RegionInfo region) {<a 
name="line.327"></a>
-<span class="sourceLineNo">328</span>    for (Map.Entry&lt;ServerName, 
List&lt;RegionInfo&gt;&gt; entry : existingAssignments.entrySet()) {<a 
name="line.328"></a>
-<span class="sourceLineNo">329</span>      if 
(entry.getValue().contains(region)) {<a name="line.329"></a>
-<span class="sourceLineNo">330</span>        return entry.getKey();<a 
name="line.330"></a>
-<span class="sourceLineNo">331</span>      }<a name="line.331"></a>
-<span class="sourceLineNo">332</span>    }<a name="line.332"></a>
-<span class="sourceLineNo">333</span><a name="line.333"></a>
-<span class="sourceLineNo">334</span>    throw new 
IllegalStateException("Could not find server for region "<a name="line.334"></a>
-<span class="sourceLineNo">335</span>        + region.getShortNameToLog());<a 
name="line.335"></a>
-<span class="sourceLineNo">336</span>  }<a name="line.336"></a>
-<span class="sourceLineNo">337</span><a name="line.337"></a>
-<span class="sourceLineNo">338</span>  private Map&lt;ServerName, 
List&lt;RegionInfo&gt;&gt; correctAssignments(<a name="line.338"></a>
-<span class="sourceLineNo">339</span>       Map&lt;ServerName, 
List&lt;RegionInfo&gt;&gt; existingAssignments)<a name="line.339"></a>
-<span class="sourceLineNo">340</span>  throws HBaseIOException{<a 
name="line.340"></a>
-<span class="sourceLineNo">341</span>    Map&lt;ServerName, 
List&lt;RegionInfo&gt;&gt; correctAssignments = new TreeMap&lt;&gt;();<a 
name="line.341"></a>
-<span class="sourceLineNo">342</span>    
correctAssignments.put(LoadBalancer.BOGUS_SERVER_NAME, new 
LinkedList&lt;&gt;());<a name="line.342"></a>
-<span class="sourceLineNo">343</span>    for (Map.Entry&lt;ServerName, 
List&lt;RegionInfo&gt;&gt; assignments : existingAssignments.entrySet()){<a 
name="line.343"></a>
-<span class="sourceLineNo">344</span>      ServerName sName = 
assignments.getKey();<a name="line.344"></a>
-<span class="sourceLineNo">345</span>      correctAssignments.put(sName, new 
LinkedList&lt;&gt;());<a name="line.345"></a>
-<span class="sourceLineNo">346</span>      List&lt;RegionInfo&gt; regions = 
assignments.getValue();<a name="line.346"></a>
-<span class="sourceLineNo">347</span>      for (RegionInfo region : regions) 
{<a name="line.347"></a>
-<span class="sourceLineNo">348</span>        RSGroupInfo info = null;<a 
name="line.348"></a>
-<span class="sourceLineNo">349</span>        try {<a name="line.349"></a>
-<span class="sourceLineNo">350</span>          info = 
rsGroupInfoManager.getRSGroup(<a name="line.350"></a>
-<span class="sourceLineNo">351</span>              
rsGroupInfoManager.getRSGroupOfTable(region.getTable()));<a name="line.351"></a>
-<span class="sourceLineNo">352</span>        } catch (IOException exp) {<a 
name="line.352"></a>
-<span class="sourceLineNo">353</span>          LOG.debug("RSGroup information 
null for region of table " + region.getTable(),<a name="line.353"></a>
-<span class="sourceLineNo">354</span>              exp);<a name="line.354"></a>
-<span class="sourceLineNo">355</span>        }<a name="line.355"></a>
-<span class="sourceLineNo">356</span>        if ((info == null) || 
(!info.containsServer(sName.getAddress()))) {<a name="line.356"></a>
-<span class="sourceLineNo">357</span>          
correctAssignments.get(LoadBalancer.BOGUS_SERVER_NAME).add(region);<a 
name="line.357"></a>
-<span class="sourceLineNo">358</span>        } else {<a name="line.358"></a>
-<span class="sourceLineNo">359</span>          
correctAssignments.get(sName).add(region);<a name="line.359"></a>
-<span class="sourceLineNo">360</span>        }<a name="line.360"></a>
-<span class="sourceLineNo">361</span>      }<a name="line.361"></a>
-<span class="sourceLineNo">362</span>    }<a name="line.362"></a>
-<span class="sourceLineNo">363</span>    return correctAssignments;<a 
name="line.363"></a>
-<span class="sourceLineNo">364</span>  }<a name="line.364"></a>
-<span class="sourceLineNo">365</span><a name="line.365"></a>
-<span class="sourceLineNo">366</span>  @Override<a name="line.366"></a>
-<span class="sourceLineNo">367</span>  public void initialize() throws 
HBaseIOException {<a name="line.367"></a>
-<span class="sourceLineNo">368</span>    try {<a name="line.368"></a>
-<span class="sourceLineNo">369</span>      if (rsGroupInfoManager == null) {<a 
name="line.369"></a>
-<span class="sourceLineNo">370</span>        List&lt;RSGroupAdminEndpoint&gt; 
cps =<a name="line.370"></a>
-<span class="sourceLineNo">371</span>          
masterServices.getMasterCoprocessorHost().findCoprocessors(RSGroupAdminEndpoint.class);<a
 name="line.371"></a>
-<span class="sourceLineNo">372</span>        if (cps.size() != 1) {<a 
name="line.372"></a>
-<span class="sourceLineNo">373</span>          String msg = "Expected one 
implementation of GroupAdminEndpoint but found " + cps.size();<a 
name="line.373"></a>
-<span class="sourceLineNo">374</span>          LOG.error(msg);<a 
name="line.374"></a>
-<span class="sourceLineNo">375</span>          throw new 
HBaseIOException(msg);<a name="line.375"></a>
-<span class="sourceLineNo">376</span>        }<a name="line.376"></a>
-<span class="sourceLineNo">377</span>        rsGroupInfoManager = 
cps.get(0).getGroupInfoManager();<a name="line.377"></a>
-<span class="sourceLineNo">378</span>      }<a name="line.378"></a>
-<span class="sourceLineNo">379</span>    } catch (IOException e) {<a 
name="line.379"></a>
-<span class="sourceLineNo">380</span>      throw new HBaseIOException("Failed 
to initialize GroupInfoManagerImpl", e);<a name="line.380"></a>
-<span class="sourceLineNo">381</span>    }<a name="line.381"></a>
-<span class="sourceLineNo">382</span><a name="line.382"></a>
-<span class="sourceLineNo">383</span>    // Create the balancer<a 
name="line.383"></a>
-<span class="sourceLineNo">384</span>    Class&lt;? extends LoadBalancer&gt; 
balancerKlass = config.getClass(HBASE_RSGROUP_LOADBALANCER_CLASS,<a 
name="line.384"></a>
-<span class="sourceLineNo">385</span>        StochasticLoadBalancer.class, 
LoadBalancer.class);<a name="line.385"></a>
-<span class="sourceLineNo">386</span>    internalBalancer = 
ReflectionUtils.newInstance(balancerKlass, config);<a name="line.386"></a>
-<span class="sourceLineNo">387</span>    
internalBalancer.setMasterServices(masterServices);<a name="line.387"></a>
-<span class="sourceLineNo">388</span>    
internalBalancer.setClusterMetrics(clusterStatus);<a name="line.388"></a>
-<span class="sourceLineNo">389</span>    internalBalancer.setConf(config);<a 
name="line.389"></a>
-<span class="sourceLineNo">390</span>    internalBalancer.initialize();<a 
name="line.390"></a>
-<span class="sourceLineNo">391</span>  }<a name="line.391"></a>
-<span class="sourceLineNo">392</span><a name="line.392"></a>
-<span class="sourceLineNo">393</span>  public boolean isOnline() {<a 
name="line.393"></a>
-<span class="sourceLineNo">394</span>    if (this.rsGroupInfoManager == null) 
{<a name="line.394"></a>
-<span class="sourceLineNo">395</span>      return false;<a name="line.395"></a>
-<span class="sourceLineNo">396</span>    }<a name="line.396"></a>
-<span class="sourceLineNo">397</span><a name="line.397"></a>
-<span class="sourceLineNo">398</span>    return 
this.rsGroupInfoManager.isOnline();<a name="line.398"></a>
-<span class="sourceLineNo">399</span>  }<a name="line.399"></a>
-<span class="sourceLineNo">400</span><a name="line.400"></a>
-<span class="sourceLineNo">401</span>  @Override<a name="line.401"></a>
-<span class="sourceLineNo">402</span>  public void 
setClusterLoad(Map&lt;TableName, Map&lt;ServerName, 
List&lt;RegionInfo&gt;&gt;&gt; clusterLoad) {<a name="line.402"></a>
-<span class="sourceLineNo">403</span>  }<a name="line.403"></a>
+<span class="sourceLineNo">322</span>      if ((info == null || 
!info.containsServer(assignedServer.getAddress()))) {<a name="line.322"></a>
+<span class="sourceLineNo">323</span>        LOG.debug("Found misplaced 
region: " + regionInfo.getRegionNameAsString() +<a name="line.323"></a>
+<span class="sourceLineNo">324</span>            " on server: " + 
assignedServer +<a name="line.324"></a>
+<span class="sourceLineNo">325</span>            " found in group: " +  
otherInfo +<a name="line.325"></a>
+<span class="sourceLineNo">326</span>            " outside of group: " + (info 
== null ? "UNKNOWN" : info.getName()));<a name="line.326"></a>
+<span class="sourceLineNo">327</span>        
misplacedRegions.add(regionInfo);<a name="line.327"></a>
+<span class="sourceLineNo">328</span>      }<a name="line.328"></a>
+<span class="sourceLineNo">329</span>    }<a name="line.329"></a>
+<span class="sourceLineNo">330</span>    return misplacedRegions;<a 
name="line.330"></a>
+<span class="sourceLineNo">331</span>  }<a name="line.331"></a>
+<span class="sourceLineNo">332</span><a name="line.332"></a>
+<span class="sourceLineNo">333</span>  private ServerName 
findServerForRegion(<a name="line.333"></a>
+<span class="sourceLineNo">334</span>      Map&lt;ServerName, 
List&lt;RegionInfo&gt;&gt; existingAssignments, RegionInfo region) {<a 
name="line.334"></a>
+<span class="sourceLineNo">335</span>    for (Map.Entry&lt;ServerName, 
List&lt;RegionInfo&gt;&gt; entry : existingAssignments.entrySet()) {<a 
name="line.335"></a>
+<span class="sourceLineNo">336</span>      if 
(entry.getValue().contains(region)) {<a name="line.336"></a>
+<span class="sourceLineNo">337</span>        return entry.getKey();<a 
name="line.337"></a>
+<span class="sourceLineNo">338</span>      }<a name="line.338"></a>
+<span class="sourceLineNo">339</span>    }<a name="line.339"></a>
+<span class="sourceLineNo">340</span><a name="line.340"></a>
+<span class="sourceLineNo">341</span>    throw new 
IllegalStateException("Could not find server for region "<a name="line.341"></a>
+<span class="sourceLineNo">342</span>        + region.getShortNameToLog());<a 
name="line.342"></a>
+<span class="sourceLineNo">343</span>  }<a name="line.343"></a>
+<span class="sourceLineNo">344</span><a name="line.344"></a>
+<span class="sourceLineNo">345</span>  private Map&lt;ServerName, 
List&lt;RegionInfo&gt;&gt; correctAssignments(<a name="line.345"></a>
+<span class="sourceLineNo">346</span>       Map&lt;ServerName, 
List&lt;RegionInfo&gt;&gt; existingAssignments)<a name="line.346"></a>
+<span class="sourceLineNo">347</span>  throws HBaseIOException{<a 
name="line.347"></a>
+<span class="sourceLineNo">348</span>    Map&lt;ServerName, 
List&lt;RegionInfo&gt;&gt; correctAssignments = new TreeMap&lt;&gt;();<a 
name="line.348"></a>
+<span class="sourceLineNo">349</span>    
correctAssignments.put(LoadBalancer.BOGUS_SERVER_NAME, new 
LinkedList&lt;&gt;());<a name="line.349"></a>
+<span class="sourceLineNo">350</span>    for (Map.Entry&lt;ServerName, 
List&lt;RegionInfo&gt;&gt; assignments : existingAssignments.entrySet()){<a 
name="line.350"></a>
+<span class="sourceLineNo">351</span>      ServerName sName = 
assignments.getKey();<a name="line.351"></a>
+<span class="sourceLineNo">352</span>      correctAssignments.put(sName, new 
LinkedList&lt;&gt;());<a name="line.352"></a>
+<span class="sourceLineNo">353</span>      List&lt;RegionInfo&gt; regions = 
assignments.getValue();<a name="line.353"></a>
+<span class="sourceLineNo">354</span>      for (RegionInfo region : regions) 
{<a name="line.354"></a>
+<span class="sourceLineNo">355</span>        RSGroupInfo info = null;<a 
name="line.355"></a>
+<span class="sourceLineNo">356</span>        try {<a name="line.356"></a>
+<span class="sourceLineNo">357</span>          info = 
rsGroupInfoManager.getRSGroup(<a name="line.357"></a>
+<span class="sourceLineNo">358</span>              
rsGroupInfoManager.getRSGroupOfTable(region.getTable()));<a name="line.358"></a>
+<span class="sourceLineNo">359</span>        } catch (IOException exp) {<a 
name="line.359"></a>
+<span class="sourceLineNo">360</span>          LOG.debug("RSGroup information 
null for region of table " + region.getTable(),<a name="line.360"></a>
+<span class="sourceLineNo">361</span>              exp);<a name="line.361"></a>
+<span class="sourceLineNo">362</span>        }<a name="line.362"></a>
+<span class="sourceLineNo">363</span>        if ((info == null) || 
(!info.containsServer(sName.getAddress()))) {<a name="line.363"></a>
+<span class="sourceLineNo">364</span>          
correctAssignments.get(LoadBalancer.BOGUS_SERVER_NAME).add(region);<a 
name="line.364"></a>
+<span class="sourceLineNo">365</span>        } else {<a name="line.365"></a>
+<span class="sourceLineNo">366</span>          
correctAssignments.get(sName).add(region);<a name="line.366"></a>
+<span class="sourceLineNo">367</span>        }<a name="line.367"></a>
+<span class="sourceLineNo">368</span>      }<a name="line.368"></a>
+<span class="sourceLineNo">369</span>    }<a name="line.369"></a>
+<span class="sourceLineNo">370</span>    return correctAssignments;<a 
name="line.370"></a>
+<span class="sourceLineNo">371</span>  }<a name="line.371"></a>
+<span class="sourceLineNo">372</span><a name="line.372"></a>
+<span class="sourceLineNo">373</span>  @Override<a name="line.373"></a>
+<span class="sourceLineNo">374</span>  public void initialize() throws 
HBaseIOException {<a name="line.374"></a>
+<span class="sourceLineNo">375</span>    try {<a name="line.375"></a>
+<span class="sourceLineNo">376</span>      if (rsGroupInfoManager == null) {<a 
name="line.376"></a>
+<span class="sourceLineNo">377</span>        List&lt;RSGroupAdminEndpoint&gt; 
cps =<a name="line.377"></a>
+<span class="sourceLineNo">378</span>          
masterServices.getMasterCoprocessorHost().findCoprocessors(RSGroupAdminEndpoint.class);<a
 name="line.378"></a>
+<span class="sourceLineNo">379</span>        if (cps.size() != 1) {<a 
name="line.379"></a>
+<span class="sourceLineNo">380</span>          String msg = "Expected one 
implementation of GroupAdminEndpoint but found " + cps.size();<a 
name="line.380"></a>
+<span class="sourceLineNo">381</span>          LOG.error(msg);<a 
name="line.381"></a>
+<span class="sourceLineNo">382</span>          throw new 
HBaseIOException(msg);<a name="line.382"></a>
+<span class="sourceLineNo">383</span>        }<a name="line.383"></a>
+<span class="sourceLineNo">384</span>        rsGroupInfoManager = 
cps.get(0).getGroupInfoManager();<a name="line.384"></a>
+<span class="sourceLineNo">385</span>      }<a name="line.385"></a>
+<span class="sourceLineNo">386</span>    } catch (IOException e) {<a 
name="line.386"></a>
+<span class="sourceLineNo">387</span>      throw new HBaseIOException("Failed 
to initialize GroupInfoManagerImpl", e);<a name="line.387"></a>
+<span class="sourceLineNo">388</span>    }<a name="line.388"></a>
+<span class="sourceLineNo">389</span><a name="line.389"></a>
+<span class="sourceLineNo">390</span>    // Create the balancer<a 
name="line.390"></a>
+<span class="sourceLineNo">391</span>    Class&lt;? extends LoadBalancer&gt; 
balancerKlass = config.getClass(HBASE_RSGROUP_LOADBALANCER_CLASS,<a 
name="line.391"></a>
+<span class="sourceLineNo">392</span>        StochasticLoadBalancer.class, 
LoadBalancer.class);<a name="line.392"></a>
+<span class="sourceLineNo">393</span>    internalBalancer = 
ReflectionUtils.newInstance(balancerKlass, config);<a name="line.393"></a>
+<span class="sourceLineNo">394</span>    
internalBalancer.setMasterServices(masterServices);<a name="line.394"></a>
+<span class="sourceLineNo">395</span>    
internalBalancer.setClusterMetrics(clusterStatus);<a name="line.395"></a>
+<span class="sourceLineNo">396</span>    internalBalancer.setConf(config);<a 
name="line.396"></a>
+<span class="sourceLineNo">397</span>    internalBalancer.initialize();<a 
name="line.397"></a>
+<span class="sourceLineNo">398</span>  }<a name="line.398"></a>
+<span class="sourceLineNo">399</span><a name="line.399"></a>
+<span class="sourceLineNo">400</span>  public boolean isOnline() {<a 
name="line.400"></a>
+<span class="sourceLineNo">401</span>    if (this.rsGroupInfoManager == null) 
{<a name="line.401"></a>
+<span class="sourceLineNo">402</span>      return false;<a name="line.402"></a>
+<span class="sourceLineNo">403</span>    }<a name="line.403"></a>
 <span class="sourceLineNo">404</span><a name="line.404"></a>
-<span class="sourceLineNo">405</span>  @Override<a name="line.405"></a>
-<span class="sourceLineNo">406</span>  public void regionOnline(RegionInfo 
regionInfo, ServerName sn) {<a name="line.406"></a>
-<span class="sourceLineNo">407</span>  }<a name="line.407"></a>
-<span class="sourceLineNo">408</span><a name="line.408"></a>
-<span class="sourceLineNo">409</span>  @Override<a name="line.409"></a>
-<span class="sourceLineNo">410</span>  public void regionOffline(RegionInfo 
regionInfo) {<a name="line.410"></a>
-<span class="sourceLineNo">411</span>  }<a name="line.411"></a>
-<span class="sourceLineNo">412</span><a name="line.412"></a>
-<span class="sourceLineNo">413</span>  @Override<a name="line.413"></a>
-<span class="sourceLineNo">414</span>  public void 
onConfigurationChange(Configuration conf) {<a name="line.414"></a>
-<span class="sourceLineNo">415</span>    //DO nothing for now<a 
name="line.415"></a>
-<span class="sourceLineNo">416</span>  }<a name="line.416"></a>
-<span class="sourceLineNo">417</span><a name="line.417"></a>
-<span class="sourceLineNo">418</span>  @Override<a name="line.418"></a>
-<span class="sourceLineNo">419</span>  public void stop(String why) {<a 
name="line.419"></a>
-<span class="sourceLineNo">420</span>  }<a name="line.420"></a>
-<span class="sourceLineNo">421</span><a name="line.421"></a>
-<span class="sourceLineNo">422</span>  @Override<a name="line.422"></a>
-<span class="sourceLineNo">423</span>  public boolean isStopped() {<a 
name="line.423"></a>
-<span class="sourceLineNo">424</span>    return false;<a name="line.424"></a>
-<span class="sourceLineNo">425</span>  }<a name="line.425"></a>
-<span class="sourceLineNo">426</span><a name="line.426"></a>
-<span class="sourceLineNo">427</span>  @VisibleForTesting<a 
name="line.427"></a>
-<span class="sourceLineNo">428</span>  public void 
setRsGroupInfoManager(RSGroupInfoManager rsGroupInfoManager) {<a 
name="line.428"></a>
-<span class="sourceLineNo">429</span>    this.rsGroupInfoManager = 
rsGroupInfoManager;<a name="line.429"></a>
-<span class="sourceLineNo">430</span>  }<a name="line.430"></a>
-<span class="sourceLineNo">431</span>}<a name="line.431"></a>
+<span class="sourceLineNo">405</span>    return 
this.rsGroupInfoManager.isOnline();<a name="line.405"></a>
+<span class="sourceLineNo">406</span>  }<a name="line.406"></a>
+<span class="sourceLineNo">407</span><a name="line.407"></a>
+<span class="sourceLineNo">408</span>  @Override<a name="line.408"></a>
+<span class="sourceLineNo">409</span>  public void 
setClusterLoad(Map&lt;TableName, Map&lt;ServerName, 
List&lt;RegionInfo&gt;&gt;&gt; clusterLoad) {<a name="line.409"></a>
+<span class="sourceLineNo">410</span>  }<a name="line.410"></a>
+<span class="sourceLineNo">411</span><a name="line.411"></a>
+<span class="sourceLineNo">412</span>  @Override<a name="line.412"></a>
+<span class="sourceLineNo">413</span>  public void regionOnline(RegionInfo 
regionInfo, ServerName sn) {<a name="line.413"></a>
+<span class="sourceLineNo">414</span>  }<a name="line.414"></a>
+<span class="sourceLineNo">415</span><a name="line.415"></a>
+<span class="sourceLineNo">416</span>  @Override<a name="line.416"></a>
+<span class="sourceLineNo">417</span>  public void regionOffline(RegionInfo 
regionInfo) {<a name="line.417"></a>
+<span class="sourceLineNo">418</span>  }<a name="line.418"></a>
+<span class="sourceLineNo">419</span><a name="line.419"></a>
+<span class="sourceLineNo">420</span>  @Override<a name="line.420"></a>
+<span class="sourceLineNo">421</span>  public void 
onConfigurationChange(Configuration conf) {<a name="line.421"></a>
+<span class="sourceLineNo">422</span>    //DO nothing for now<a 
name="line.422"></a>
+<span class="sourceLineNo">423</span>  }<a name="line.423"></a>
+<span class="sourceLineNo">424</span><a name="line.424"></a>
+<span class="sourceLineNo">425</span>  @Override<a name="line.425"></a>
+<span class="sourceLineNo">426</span>  public void stop(String why) {<a 
name="line.426"></a>
+<span class="sourceLineNo">427</span>  }<a name="line.427"></a>
+<span class="sourceLineNo">428</span><a name="line.428"></a>
+<span class="sourceLineNo">429</span>  @Override<a name="line.429"></a>
+<span class="sourceLineNo">430</span>  public boolean isStopped() {<a 
name="line.430"></a>
+<span class="sourceLineNo">431</span>    return false;<a name="line.431"></a>
+<span class="sourceLineNo">432</span>  }<a name="line.432"></a>
+<span class="sourceLineNo">433</span><a name="line.433"></a>
+<span class="sourceLineNo">434</span>  @VisibleForTesting<a 
name="line.434"></a>
+<span class="sourceLineNo">435</span>  public void 
setRsGroupInfoManager(RSGroupInfoManager rsGroupInfoManager) {<a 
name="line.435"></a>
+<span class="sourceLineNo">436</span>    this.rsGroupInfoManager = 
rsGroupInfoManager;<a name="line.436"></a>
+<span class="sourceLineNo">437</span>  }<a name="line.437"></a>
+<span class="sourceLineNo">438</span>}<a name="line.438"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/554d61c6/devapidocs/src-html/org/apache/hadoop/hbase/util/JVMClusterUtil.MasterThread.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/util/JVMClusterUtil.MasterThread.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/util/JVMClusterUtil.MasterThread.html
index a3f7dcb..d54cf36 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/util/JVMClusterUtil.MasterThread.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/util/JVMClusterUtil.MasterThread.html
@@ -195,77 +195,77 @@
 <span class="sourceLineNo">187</span>      int startTimeout = configuration != 
null ? Integer.parseInt(<a name="line.187"></a>
 <span class="sourceLineNo">188</span>        
configuration.get("hbase.master.start.timeout.localHBaseCluster", "30000")) : 
30000;<a name="line.188"></a>
 <span class="sourceLineNo">189</span>      if (System.currentTimeMillis() &gt; 
startTime + startTimeout) {<a name="line.189"></a>
-<span class="sourceLineNo">190</span>        throw new 
RuntimeException(String.format("Master not active after %s seconds", 
startTimeout));<a name="line.190"></a>
-<span class="sourceLineNo">191</span>      }<a name="line.191"></a>
-<span class="sourceLineNo">192</span>    }<a name="line.192"></a>
-<span class="sourceLineNo">193</span><a name="line.193"></a>
-<span class="sourceLineNo">194</span>    if (regionservers != null) {<a 
name="line.194"></a>
-<span class="sourceLineNo">195</span>      for 
(JVMClusterUtil.RegionServerThread t: regionservers) {<a name="line.195"></a>
-<span class="sourceLineNo">196</span>        t.start();<a name="line.196"></a>
-<span class="sourceLineNo">197</span>      }<a name="line.197"></a>
-<span class="sourceLineNo">198</span>    }<a name="line.198"></a>
-<span class="sourceLineNo">199</span><a name="line.199"></a>
-<span class="sourceLineNo">200</span>    // Wait for an active master to be 
initialized (implies being master)<a name="line.200"></a>
-<span class="sourceLineNo">201</span>    //  with this, when we return the 
cluster is complete<a name="line.201"></a>
-<span class="sourceLineNo">202</span>    startTime = 
System.currentTimeMillis();<a name="line.202"></a>
-<span class="sourceLineNo">203</span>    final int maxwait = 200000;<a 
name="line.203"></a>
-<span class="sourceLineNo">204</span>    while (true) {<a name="line.204"></a>
-<span class="sourceLineNo">205</span>      JVMClusterUtil.MasterThread t = 
findActiveMaster(masters);<a name="line.205"></a>
-<span class="sourceLineNo">206</span>      if (t != null &amp;&amp; 
t.master.isInitialized()) {<a name="line.206"></a>
-<span class="sourceLineNo">207</span>        return 
t.master.getServerName().toString();<a name="line.207"></a>
-<span class="sourceLineNo">208</span>      }<a name="line.208"></a>
-<span class="sourceLineNo">209</span>      // REMOVE<a name="line.209"></a>
-<span class="sourceLineNo">210</span>      if (System.currentTimeMillis() &gt; 
startTime + 10000) {<a name="line.210"></a>
-<span class="sourceLineNo">211</span>        try {<a name="line.211"></a>
-<span class="sourceLineNo">212</span>          Thread.sleep(1000);<a 
name="line.212"></a>
-<span class="sourceLineNo">213</span>        } catch (InterruptedException e) 
{<a name="line.213"></a>
-<span class="sourceLineNo">214</span>          throw 
(InterruptedIOException)new InterruptedIOException().initCause(e);<a 
name="line.214"></a>
-<span class="sourceLineNo">215</span>        }<a name="line.215"></a>
-<span class="sourceLineNo">216</span>      }<a name="line.216"></a>
-<span class="sourceLineNo">217</span>      if (System.currentTimeMillis() &gt; 
startTime + maxwait) {<a name="line.217"></a>
-<span class="sourceLineNo">218</span>        String msg = "Master not 
initialized after " + maxwait + "ms seconds";<a name="line.218"></a>
-<span class="sourceLineNo">219</span>        
Threads.printThreadInfo(System.out,<a name="line.219"></a>
-<span class="sourceLineNo">220</span>          "Thread dump because: " + 
msg);<a name="line.220"></a>
-<span class="sourceLineNo">221</span>        throw new 
RuntimeException(msg);<a name="line.221"></a>
-<span class="sourceLineNo">222</span>      }<a name="line.222"></a>
-<span class="sourceLineNo">223</span>      try {<a name="line.223"></a>
-<span class="sourceLineNo">224</span>        Thread.sleep(100);<a 
name="line.224"></a>
-<span class="sourceLineNo">225</span>      } catch (InterruptedException e) 
{<a name="line.225"></a>
-<span class="sourceLineNo">226</span>        throw (InterruptedIOException)new 
InterruptedIOException().initCause(e);<a name="line.226"></a>
-<span class="sourceLineNo">227</span>      }<a name="line.227"></a>
-<span class="sourceLineNo">228</span>    }<a name="line.228"></a>
-<span class="sourceLineNo">229</span>  }<a name="line.229"></a>
-<span class="sourceLineNo">230</span><a name="line.230"></a>
-<span class="sourceLineNo">231</span>  /**<a name="line.231"></a>
-<span class="sourceLineNo">232</span>   * @param masters<a name="line.232"></a>
-<span class="sourceLineNo">233</span>   * @param regionservers<a 
name="line.233"></a>
-<span class="sourceLineNo">234</span>   */<a name="line.234"></a>
-<span class="sourceLineNo">235</span>  public static void shutdown(final 
List&lt;MasterThread&gt; masters,<a name="line.235"></a>
-<span class="sourceLineNo">236</span>      final 
List&lt;RegionServerThread&gt; regionservers) {<a name="line.236"></a>
-<span class="sourceLineNo">237</span>    LOG.debug("Shutting down HBase 
Cluster");<a name="line.237"></a>
-<span class="sourceLineNo">238</span>    if (masters != null) {<a 
name="line.238"></a>
-<span class="sourceLineNo">239</span>      // Do backups first.<a 
name="line.239"></a>
-<span class="sourceLineNo">240</span>      JVMClusterUtil.MasterThread 
activeMaster = null;<a name="line.240"></a>
-<span class="sourceLineNo">241</span>      for (JVMClusterUtil.MasterThread t 
: masters) {<a name="line.241"></a>
-<span class="sourceLineNo">242</span>        if (!t.master.isActiveMaster()) 
{<a name="line.242"></a>
-<span class="sourceLineNo">243</span>          try {<a name="line.243"></a>
-<span class="sourceLineNo">244</span>            t.master.stopMaster();<a 
name="line.244"></a>
-<span class="sourceLineNo">245</span>          } catch (IOException e) {<a 
name="line.245"></a>
-<span class="sourceLineNo">246</span>            LOG.error("Exception occurred 
while stopping master", e);<a name="line.246"></a>
-<span class="sourceLineNo">247</span>          }<a name="line.247"></a>
-<span class="sourceLineNo">248</span>        } else {<a name="line.248"></a>
-<span class="sourceLineNo">249</span>          activeMaster = t;<a 
name="line.249"></a>
-<span class="sourceLineNo">250</span>        }<a name="line.250"></a>
-<span class="sourceLineNo">251</span>      }<a name="line.251"></a>
-<span class="sourceLineNo">252</span>      // Do active after.<a 
name="line.252"></a>
-<span class="sourceLineNo">253</span>      if (activeMaster != null) {<a 
name="line.253"></a>
-<span class="sourceLineNo">254</span>        try {<a name="line.254"></a>
-<span class="sourceLineNo">255</span>          
activeMaster.master.shutdown();<a name="line.255"></a>
-<span class="sourceLineNo">256</span>        } catch (IOException e) {<a 
name="line.256"></a>
-<span class="sourceLineNo">257</span>          LOG.error("Exception occurred 
in HMaster.shutdown()", e);<a name="line.257"></a>
-<span class="sourceLineNo">258</span>        }<a name="line.258"></a>
-<span class="sourceLineNo">259</span>      }<a name="line.259"></a>
-<span class="sourceLineNo">260</span><a name="line.260"></a>
+<span class="sourceLineNo">190</span>        String msg = "Master not active 
after " + startTimeout + "ms";<a name="line.190"></a>
+<span class="sourceLineNo">191</span>        
Threads.printThreadInfo(System.out, "Thread dump because: " + msg);<a 
name="line.191"></a>
+<span class="sourceLineNo">192</span>        throw new 
RuntimeException(msg);<a name="line.192"></a>
+<span class="sourceLineNo">193</span>      }<a name="line.193"></a>
+<span class="sourceLineNo">194</span>    }<a name="line.194"></a>
+<span class="sourceLineNo">195</span><a name="line.195"></a>
+<span class="sourceLineNo">196</span>    if (regionservers != null) {<a 
name="line.196"></a>
+<span class="sourceLineNo">197</span>      for 
(JVMClusterUtil.RegionServerThread t: regionservers) {<a name="line.197"></a>
+<span class="sourceLineNo">198</span>        t.start();<a name="line.198"></a>
+<span class="sourceLineNo">199</span>      }<a name="line.199"></a>
+<span class="sourceLineNo">200</span>    }<a name="line.200"></a>
+<span class="sourceLineNo">201</span><a name="line.201"></a>
+<span class="sourceLineNo">202</span>    // Wait for an active master to be 
initialized (implies being master)<a name="line.202"></a>
+<span class="sourceLineNo">203</span>    //  with this, when we return the 
cluster is complete<a name="line.203"></a>
+<span class="sourceLineNo">204</span>    startTime = 
System.currentTimeMillis();<a name="line.204"></a>
+<span class="sourceLineNo">205</span>    final int maxwait = 200000;<a 
name="line.205"></a>
+<span class="sourceLineNo">206</span>    while (true) {<a name="line.206"></a>
+<span class="sourceLineNo">207</span>      JVMClusterUtil.MasterThread t = 
findActiveMaster(masters);<a name="line.207"></a>
+<span class="sourceLineNo">208</span>      if (t != null &amp;&amp; 
t.master.isInitialized()) {<a name="line.208"></a>
+<span class="sourceLineNo">209</span>        return 
t.master.getServerName().toString();<a name="line.209"></a>
+<span class="sourceLineNo">210</span>      }<a name="line.210"></a>
+<span class="sourceLineNo">211</span>      // REMOVE<a name="line.211"></a>
+<span class="sourceLineNo">212</span>      if (System.currentTimeMillis() &gt; 
startTime + 10000) {<a name="line.212"></a>
+<span class="sourceLineNo">213</span>        try {<a name="line.213"></a>
+<span class="sourceLineNo">214</span>          Thread.sleep(1000);<a 
name="line.214"></a>
+<span class="sourceLineNo">215</span>        } catch (InterruptedException e) 
{<a name="line.215"></a>
+<span class="sourceLineNo">216</span>          throw 
(InterruptedIOException)new InterruptedIOException().initCause(e);<a 
name="line.216"></a>
+<span class="sourceLineNo">217</span>        }<a name="line.217"></a>
+<span class="sourceLineNo">218</span>      }<a name="line.218"></a>
+<span class="sourceLineNo">219</span>      if (System.currentTimeMillis() &gt; 
startTime + maxwait) {<a name="line.219"></a>
+<span class="sourceLineNo">220</span>        String msg = "Master not 
initialized after " + maxwait + "ms seconds";<a name="line.220"></a>
+<span class="sourceLineNo">221</span>        
Threads.printThreadInfo(System.out, "Thread dump because: " + msg);<a 
name="line.221"></a>
+<span class="sourceLineNo">222</span>        throw new 
RuntimeException(msg);<a name="line.222"></a>
+<span class="sourceLineNo">223</span>      }<a name="line.223"></a>
+<span class="sourceLineNo">224</span>      try {<a name="line.224"></a>
+<span class="sourceLineNo">225</span>        Thread.sleep(100);<a 
name="line.225"></a>
+<span class="sourceLineNo">226</span>      } catch (InterruptedException e) 
{<a name="line.226"></a>
+<span class="sourceLineNo">227</span>        throw (InterruptedIOException)new 
InterruptedIOException().initCause(e);<a name="line.227"></a>
+<span class="sourceLineNo">228</span>      }<a name="line.228"></a>
+<span class="sourceLineNo">229</span>    }<a name="line.229"></a>
+<span class="sourceLineNo">230</span>  }<a name="line.230"></a>
+<span class="sourceLineNo">231</span><a name="line.231"></a>
+<span class="sourceLineNo">232</span>  /**<a name="line.232"></a>
+<span class="sourceLineNo">233</span>   * @param masters<a name="line.233"></a>
+<span class="sourceLineNo">234</span>   * @param regionservers<a 
name="line.234"></a>
+<span class="sourceLineNo">235</span>   */<a name="line.235"></a>
+<span class="sourceLineNo">236</span>  public static void shutdown(final 
List&lt;MasterThread&gt; masters,<a name="line.236"></a>
+<span class="sourceLineNo">237</span>      final 
List&lt;RegionServerThread&gt; regionservers) {<a name="line.237"></a>
+<span class="sourceLineNo">238</span>    LOG.debug("Shutting down HBase 
Cluster");<a name="line.238"></a>
+<span class="sourceLineNo">239</span>    if (masters != null) {<a 
name="line.239"></a>
+<span class="sourceLineNo">240</span>      // Do backups first.<a 
name="line.240"></a>
+<span class="sourceLineNo">241</span>      JVMClusterUtil.MasterThread 
activeMaster = null;<a name="line.241"></a>
+<span class="sourceLineNo">242</span>      for (JVMClusterUtil.MasterThread t 
: masters) {<a name="line.242"></a>
+<span class="sourceLineNo">243</span>        if (!t.master.isActiveMaster()) 
{<a name="line.243"></a>
+<span class="sourceLineNo">244</span>          try {<a name="line.244"></a>
+<span class="sourceLineNo">245</span>            t.master.stopMaster();<a 
name="line.245"></a>
+<span class="sourceLineNo">246</span>          } catch (IOException e) {<a 
name="line.246"></a>
+<span class="sourceLineNo">247</span>            LOG.error("Exception occurred 
while stopping master", e);<a name="line.247"></a>
+<span class="sourceLineNo">248</span>          }<a name="line.248"></a>
+<span class="sourceLineNo">249</span>        } else {<a name="line.249"></a>
+<span class="sourceLineNo">250</span>          activeMaster = t;<a 
name="line.250"></a>
+<span class="sourceLineNo">251</span>        }<a name="line.251"></a>
+<span class="sourceLineNo">252</span>      }<a name="line.252"></a>
+<span class="sourceLineNo">253</span>      // Do active after.<a 
name="line.253"></a>
+<span class="sourceLineNo">254</span>      if (activeMaster != null) {<a 
name="line.254"></a>
+<span class="sourceLineNo">255</span>        try {<a name="line.255"></a>
+<span class="sourceLineNo">256</span>          
activeMaster.master.shutdown();<a name="line.256"></a>
+<span class="sourceLineNo">257</span>        } catch (IOException e) {<a 
name="line.257"></a>
+<span class="sourceLineNo">258</span>          LOG.error("Exception occurred 
in HMaster.shutdown()", e);<a name="line.258"></a>
+<span class="sourceLineNo">259</span>        }<a name="line.259"></a>
+<span class="sourceLineNo">260</span>      }<a name="line.260"></a>
 <span class="sourceLineNo">261</span>    }<a name="line.261"></a>
 <span class="sourceLineNo">262</span>    boolean wasInterrupted = false;<a 
name="line.262"></a>
 <span class="sourceLineNo">263</span>    final long maxTime = 
System.currentTimeMillis() + 30 * 1000;<a name="line.263"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/554d61c6/devapidocs/src-html/org/apache/hadoop/hbase/util/JVMClusterUtil.RegionServerThread.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/util/JVMClusterUtil.RegionServerThread.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/util/JVMClusterUtil.RegionServerThread.html
index a3f7dcb..d54cf36 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/util/JVMClusterUtil.RegionServerThread.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/util/JVMClusterUtil.RegionServerThread.html
@@ -195,77 +195,77 @@
 <span class="sourceLineNo">187</span>      int startTimeout = configuration != 
null ? Integer.parseInt(<a name="line.187"></a>
 <span class="sourceLineNo">188</span>        
configuration.get("hbase.master.start.timeout.localHBaseCluster", "30000")) : 
30000;<a name="line.188"></a>
 <span class="sourceLineNo">189</span>      if (System.currentTimeMillis() &gt; 
startTime + startTimeout) {<a name="line.189"></a>
-<span class="sourceLineNo">190</span>        throw new 
RuntimeException(String.format("Master not active after %s seconds", 
startTimeout));<a name="line.190"></a>
-<span class="sourceLineNo">191</span>      }<a name="line.191"></a>
-<span class="sourceLineNo">192</span>    }<a name="line.192"></a>
-<span class="sourceLineNo">193</span><a name="line.193"></a>
-<span class="sourceLineNo">194</span>    if (regionservers != null) {<a 
name="line.194"></a>
-<span class="sourceLineNo">195</span>      for 
(JVMClusterUtil.RegionServerThread t: regionservers) {<a name="line.195"></a>
-<span class="sourceLineNo">196</span>        t.start();<a name="line.196"></a>
-<span class="sourceLineNo">197</span>      }<a name="line.197"></a>
-<span class="sourceLineNo">198</span>    }<a name="line.198"></a>
-<span class="sourceLineNo">199</span><a name="line.199"></a>
-<span class="sourceLineNo">200</span>    // Wait for an active master to be 
initialized (implies being master)<a name="line.200"></a>
-<span class="sourceLineNo">201</span>    //  with this, when we return the 
cluster is complete<a name="line.201"></a>
-<span class="sourceLineNo">202</span>    startTime = 
System.currentTimeMillis();<a name="line.202"></a>
-<span class="sourceLineNo">203</span>    final int maxwait = 200000;<a 
name="line.203"></a>
-<span class="sourceLineNo">204</span>    while (true) {<a name="line.204"></a>
-<span class="sourceLineNo">205</span>      JVMClusterUtil.MasterThread t = 
findActiveMaster(masters);<a name="line.205"></a>
-<span class="sourceLineNo">206</span>      if (t != null &amp;&amp; 
t.master.isInitialized()) {<a name="line.206"></a>
-<span class="sourceLineNo">207</span>        return 
t.master.getServerName().toString();<a name="line.207"></a>
-<span class="sourceLineNo">208</span>      }<a name="line.208"></a>
-<span class="sourceLineNo">209</span>      // REMOVE<a name="line.209"></a>
-<span class="sourceLineNo">210</span>      if (System.currentTimeMillis() &gt; 
startTime + 10000) {<a name="line.210"></a>
-<span class="sourceLineNo">211</span>        try {<a name="line.211"></a>
-<span class="sourceLineNo">212</span>          Thread.sleep(1000);<a 
name="line.212"></a>
-<span class="sourceLineNo">213</span>        } catch (InterruptedException e) 
{<a name="line.213"></a>
-<span class="sourceLineNo">214</span>          throw 
(InterruptedIOException)new InterruptedIOException().initCause(e);<a 
name="line.214"></a>
-<span class="sourceLineNo">215</span>        }<a name="line.215"></a>
-<span class="sourceLineNo">216</span>      }<a name="line.216"></a>
-<span class="sourceLineNo">217</span>      if (System.currentTimeMillis() &gt; 
startTime + maxwait) {<a name="line.217"></a>
-<span class="sourceLineNo">218</span>        String msg = "Master not 
initialized after " + maxwait + "ms seconds";<a name="line.218"></a>
-<span class="sourceLineNo">219</span>        
Threads.printThreadInfo(System.out,<a name="line.219"></a>
-<span class="sourceLineNo">220</span>          "Thread dump because: " + 
msg);<a name="line.220"></a>
-<span class="sourceLineNo">221</span>        throw new 
RuntimeException(msg);<a name="line.221"></a>
-<span class="sourceLineNo">222</span>      }<a name="line.222"></a>
-<span class="sourceLineNo">223</span>      try {<a name="line.223"></a>
-<span class="sourceLineNo">224</span>        Thread.sleep(100);<a 
name="line.224"></a>
-<span class="sourceLineNo">225</span>      } catch (InterruptedException e) 
{<a name="line.225"></a>
-<span class="sourceLineNo">226</span>        throw (InterruptedIOException)new 
InterruptedIOException().initCause(e);<a name="line.226"></a>
-<span class="sourceLineNo">227</span>      }<a name="line.227"></a>
-<span class="sourceLineNo">228</span>    }<a name="line.228"></a>
-<span class="sourceLineNo">229</span>  }<a name="line.229"></a>
-<span class="sourceLineNo">230</span><a name="line.230"></a>
-<span class="sourceLineNo">231</span>  /**<a name="line.231"></a>
-<span class="sourceLineNo">232</span>   * @param masters<a name="line.232"></a>
-<span class="sourceLineNo">233</span>   * @param regionservers<a 
name="line.233"></a>
-<span class="sourceLineNo">234</span>   */<a name="line.234"></a>
-<span class="sourceLineNo">235</span>  public static void shutdown(final 
List&lt;MasterThread&gt; masters,<a name="line.235"></a>
-<span class="sourceLineNo">236</span>      final 
List&lt;RegionServerThread&gt; regionservers) {<a name="line.236"></a>
-<span class="sourceLineNo">237</span>    LOG.debug("Shutting down HBase 
Cluster");<a name="line.237"></a>
-<span class="sourceLineNo">238</span>    if (masters != null) {<a 
name="line.238"></a>
-<span class="sourceLineNo">239</span>      // Do backups first.<a 
name="line.239"></a>
-<span class="sourceLineNo">240</span>      JVMClusterUtil.MasterThread 
activeMaster = null;<a name="line.240"></a>
-<span class="sourceLineNo">241</span>      for (JVMClusterUtil.MasterThread t 
: masters) {<a name="line.241"></a>
-<span class="sourceLineNo">242</span>        if (!t.master.isActiveMaster()) 
{<a name="line.242"></a>
-<span class="sourceLineNo">243</span>          try {<a name="line.243"></a>
-<span class="sourceLineNo">244</span>            t.master.stopMaster();<a 
name="line.244"></a>
-<span class="sourceLineNo">245</span>          } catch (IOException e) {<a 
name="line.245"></a>
-<span class="sourceLineNo">246</span>            LOG.error("Exception occurred 
while stopping master", e);<a name="line.246"></a>
-<span class="sourceLineNo">247</span>          }<a name="line.247"></a>
-<span class="sourceLineNo">248</span>        } else {<a name="line.248"></a>
-<span class="sourceLineNo">249</span>          activeMaster = t;<a 
name="line.249"></a>
-<span class="sourceLineNo">250</span>        }<a name="line.250"></a>
-<span class="sourceLineNo">251</span>      }<a name="line.251"></a>
-<span class="sourceLineNo">252</span>      // Do active after.<a 
name="line.252"></a>
-<span class="sourceLineNo">253</span>      if (activeMaster != null) {<a 
name="line.253"></a>
-<span class="sourceLineNo">254</span>        try {<a name="line.254"></a>
-<span class="sourceLineNo">255</span>          
activeMaster.master.shutdown();<a name="line.255"></a>
-<span class="sourceLineNo">256</span>        } catch (IOException e) {<a 
name="line.256"></a>
-<span class="sourceLineNo">257</span>          LOG.error("Exception occurred 
in HMaster.shutdown()", e);<a name="line.257"></a>
-<span class="sourceLineNo">258</span>        }<a name="line.258"></a>
-<span class="sourceLineNo">259</span>      }<a name="line.259"></a>
-<span class="sourceLineNo">260</span><a name="line.260"></a>
+<span class="sourceLineNo">190</span>        String msg = "Master not active 
after " + startTimeout + "ms";<a name="line.190"></a>
+<span class="sourceLineNo">191</span>        
Threads.printThreadInfo(System.out, "Thread dump because: " + msg);<a 
name="line.191"></a>
+<span class="sourceLineNo">192</span>        throw new 
RuntimeException(msg);<a name="line.192"></a>
+<span class="sourceLineNo">193</span>      }<a name="line.193"></a>
+<span class="sourceLineNo">194</span>    }<a name="line.194"></a>
+<span class="sourceLineNo">195</span><a name="line.195"></a>
+<span class="sourceLineNo">196</span>    if (regionservers != null) {<a 
name="line.196"></a>
+<span class="sourceLineNo">197</span>      for 
(JVMClusterUtil.RegionServerThread t: regionservers) {<a name="line.197"></a>
+<span class="sourceLineNo">198</span>        t.start();<a name="line.198"></a>
+<span class="sourceLineNo">199</span>      }<a name="line.199"></a>
+<span class="sourceLineNo">200</span>    }<a name="line.200"></a>
+<span class="sourceLineNo">201</span><a name="line.201"></a>
+<span class="sourceLineNo">202</span>    // Wait for an active master to be 
initialized (implies being master)<a name="line.202"></a>
+<span class="sourceLineNo">203</span>    //  with this, when we return the 
cluster is complete<a name="line.203"></a>
+<span class="sourceLineNo">204</span>    startTime = 
System.currentTimeMillis();<a name="line.204"></a>
+<span class="sourceLineNo">205</span>    final int maxwait = 200000;<a 
name="line.205"></a>
+<span class="sourceLineNo">206</span>    while (true) {<a name="line.206"></a>
+<span class="sourceLineNo">207</span>      JVMClusterUtil.MasterThread t = 
findActiveMaster(masters);<a name="line.207"></a>
+<span class="sourceLineNo">208</span>      if (t != null &amp;&amp; 
t.master.isInitialized()) {<a name="line.208"></a>
+<span class="sourceLineNo">209</span>        return 
t.master.getServerName().toString();<a name="line.209"></a>
+<span class="sourceLineNo">210</span>      }<a name="line.210"></a>
+<span class="sourceLineNo">211</span>      // REMOVE<a name="line.211"></a>
+<span class="sourceLineNo">212</span>      if (System.currentTimeMillis() &gt; 
startTime + 10000) {<a name="line.212"></a>
+<span class="sourceLineNo">213</span>        try {<a name="line.213"></a>
+<span class="sourceLineNo">214</span>          Thread.sleep(1000);<a 
name="line.214"></a>
+<span class="sourceLineNo">215</span>        } catch (InterruptedException e) 
{<a name="line.215"></a>
+<span class="sourceLineNo">216</span>          throw 
(InterruptedIOException)new InterruptedIOException().initCause(e);<a 
name="line.216"></a>
+<span class="sourceLineNo">217</span>        }<a name="line.217"></a>
+<span class="sourceLineNo">218</span>      }<a name="line.218"></a>
+<span class="sourceLineNo">219</span>      if (System.currentTimeMillis() &gt; 
startTime + maxwait) {<a name="line.219"></a>
+<span class="sourceLineNo">220</span>        String msg = "Master not 
initialized after " + maxwait + "ms seconds";<a name="line.220"></a>
+<span class="sourceLineNo">221</span>        
Threads.printThreadInfo(System.out, "Thread dump because: " + msg);<a 
name="line.221"></a>
+<span class="sourceLineNo">222</span>        throw new 
RuntimeException(msg);<a name="line.222"></a>
+<span class="sourceLineNo">223</span>      }<a name="line.223"></a>
+<span class="sourceLineNo">224</span>      try {<a name="line.224"></a>
+<span class="sourceLineNo">225</span>        Thread.sleep(100);<a 
name="line.225"></a>
+<span class="sourceLineNo">226</span>      } catch (InterruptedException e) 
{<a name="line.226"></a>
+<span class="sourceLineNo">227</span>        throw (InterruptedIOException)new 
InterruptedIOException().initCause(e);<a name="line.227"></a>
+<span class="sourceLineNo">228</span>      }<a name="line.228"></a>
+<span class="sourceLineNo">229</span>    }<a name="line.229"></a>
+<span class="sourceLineNo">230</span>  }<a name="line.230"></a>
+<span class="sourceLineNo">231</span><a name="line.231"></a>
+<span class="sourceLineNo">232</span>  /**<a name="line.232"></a>
+<span class="sourceLineNo">233</span>   * @param masters<a name="line.233"></a>
+<span class="sourceLineNo">234</span>   * @param regionservers<a 
name="line.234"></a>
+<span class="sourceLineNo">235</span>   */<a name="line.235"></a>
+<span class="sourceLineNo">236</span>  public static void shutdown(final 
List&lt;MasterThread&gt; masters,<a name="line.236"></a>
+<span class="sourceLineNo">237</span>      final 
List&lt;RegionServerThread&gt; regionservers) {<a name="line.237"></a>
+<span class="sourceLineNo">238</span>    LOG.debug("Shutting down HBase 
Cluster");<a name="line.238"></a>
+<span class="sourceLineNo">239</span>    if (masters != null) {<a 
name="line.239"></a>
+<span class="sourceLineNo">240</span>      // Do backups first.<a 
name="line.240"></a>
+<span class="sourceLineNo">241</span>      JVMClusterUtil.MasterThread 
activeMaster = null;<a name="line.241"></a>
+<span class="sourceLineNo">242</span>      for (JVMClusterUtil.MasterThread t 
: masters) {<a name="line.242"></a>
+<span class="sourceLineNo">243</span>        if (!t.master.isActiveMaster()) 
{<a name="line.243"></a>
+<span class="sourceLineNo">244</span>          try {<a name="line.244"></a>
+<span class="sourceLineNo">245</span>            t.master.stopMaster();<a 
name="line.245"></a>
+<span class="sourceLineNo">246</span>          } catch (IOException e) {<a 
name="line.246"></a>
+<span class="sourceLineNo">247</span>            LOG.error("Exception occurred 
while stopping master", e);<a name="line.247"></a>
+<span class="sourceLineNo">248</span>          }<a name="line.248"></a>
+<span class="sourceLineNo">249</span>        } else {<a name="line.249"></a>
+<span class="sourceLineNo">250</span>          activeMaster = t;<a 
name="line.250"></a>
+<span class="sourceLineNo">251</span>        }<a name="line.251"></a>
+<span class="sourceLineNo">252</span>      }<a name="line.252"></a>
+<span class="sourceLineNo">253</span>      // Do active after.<a 
name="line.253"></a>
+<span class="sourceLineNo">254</span>      if (activeMaster != null) {<a 
name="line.254"></a>
+<span class="sourceLineNo">255</span>        try {<a name="line.255"></a>
+<span class="sourceLineNo">256</span>          
activeMaster.master.shutdown();<a name="line.256"></a>
+<span class="sourceLineNo">257</span>        } catch (IOException e) {<a 
name="line.257"></a>
+<span class="sourceLineNo">258</span>          LOG.error("Exception occurred 
in HMaster.shutdown()", e);<a name="line.258"></a>
+<span class="sourceLineNo">259</span>        }<a name="line.259"></a>
+<span class="sourceLineNo">260</span>      }<a name="line.260"></a>
 <span class="sourceLineNo">261</span>    }<a name="line.261"></a>
 <span class="sourceLineNo">262</span>    boolean wasInterrupted = false;<a 
name="line.262"></a>
 <span class="sourceLineNo">263</span>    final long maxTime = 
System.currentTimeMillis() + 30 * 1000;<a name="line.263"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/554d61c6/devapidocs/src-html/org/apache/hadoop/hbase/util/JVMClusterUtil.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/util/JVMClusterUtil.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/util/JVMClusterUtil.html
index a3f7dcb..d54cf36 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/util/JVMClusterUtil.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/util/JVMClusterUtil.html
@@ -195,77 +195,77 @@
 <span class="sourceLineNo">187</span>      int startTimeout = configuration != 
null ? Integer.parseInt(<a name="line.187"></a>
 <span class="sourceLineNo">188</span>        
configuration.get("hbase.master.start.timeout.localHBaseCluster", "30000")) : 
30000;<a name="line.188"></a>
 <span class="sourceLineNo">189</span>      if (System.currentTimeMillis() &gt; 
startTime + startTimeout) {<a name="line.189"></a>
-<span class="sourceLineNo">190</span>        throw new 
RuntimeException(String.format("Master not active after %s seconds", 
startTimeout));<a name="line.190"></a>
-<span class="sourceLineNo">191</span>      }<a name="line.191"></a>
-<span class="sourceLineNo">192</span>    }<a name="line.192"></a>
-<span class="sourceLineNo">193</span><a name="line.193"></a>
-<span class="sourceLineNo">194</span>    if (regionservers != null) {<a 
name="line.194"></a>
-<span class="sourceLineNo">195</span>      for 
(JVMClusterUtil.RegionServerThread t: regionservers) {<a name="line.195"></a>
-<span class="sourceLineNo">196</span>        t.start();<a name="line.196"></a>
-<span class="sourceLineNo">197</span>      }<a name="line.197"></a>
-<span class="sourceLineNo">198</span>    }<a name="line.198"></a>
-<span class="sourceLineNo">199</span><a name="line.199"></a>
-<span class="sourceLineNo">200</span>    // Wait for an active master to be 
initialized (implies being master)<a name="line.200"></a>
-<span class="sourceLineNo">201</span>    //  with this, when we return the 
cluster is complete<a name="line.201"></a>
-<span class="sourceLineNo">202</span>    startTime = 
System.currentTimeMillis();<a name="line.202"></a>
-<span class="sourceLineNo">203</span>    final int maxwait = 200000;<a 
name="line.203"></a>
-<span class="sourceLineNo">204</span>    while (true) {<a name="line.204"></a>
-<span class="sourceLineNo">205</span>      JVMClusterUtil.MasterThread t = 
findActiveMaster(masters);<a name="line.205"></a>
-<span class="sourceLineNo">206</span>      if (t != null &amp;&amp; 
t.master.isInitialized()) {<a name="line.206"></a>
-<span class="sourceLineNo">207</span>        return 
t.master.getServerName().toString();<a name="line.207"></a>
-<span class="sourceLineNo">208</span>      }<a name="line.208"></a>
-<span class="sourceLineNo">209</span>      // REMOVE<a name="line.209"></a>
-<span class="sourceLineNo">210</span>      if (System.currentTimeMillis() &gt; 
startTime + 10000) {<a name="line.210"></a>
-<span class="sourceLineNo">211</span>        try {<a name="line.211"></a>
-<span class="sourceLineNo">212</span>          Thread.sleep(1000);<a 
name="line.212"></a>
-<span class="sourceLineNo">213</span>        } catch (InterruptedException e) 
{<a name="line.213"></a>
-<span class="sourceLineNo">214</span>          throw 
(InterruptedIOException)new InterruptedIOException().initCause(e);<a 
name="line.214"></a>
-<span class="sourceLineNo">215</span>        }<a name="line.215"></a>
-<span class="sourceLineNo">216</span>      }<a name="line.216"></a>
-<span class="sourceLineNo">217</span>      if (System.currentTimeMillis() &gt; 
startTime + maxwait) {<a name="line.217"></a>
-<span class="sourceLineNo">218</span>        String msg = "Master not 
initialized after " + maxwait + "ms seconds";<a name="line.218"></a>
-<span class="sourceLineNo">219</span>        
Threads.printThreadInfo(System.out,<a name="line.219"></a>
-<span class="sourceLineNo">220</span>          "Thread dump because: " + 
msg);<a name="line.220"></a>
-<span class="sourceLineNo">221</span>        throw new 
RuntimeException(msg);<a name="line.221"></a>
-<span class="sourceLineNo">222</span>      }<a name="line.222"></a>
-<span class="sourceLineNo">223</span>      try {<a name="line.223"></a>
-<span class="sourceLineNo">224</span>        Thread.sleep(100);<a 
name="line.224"></a>
-<span class="sourceLineNo">225</span>      } catch (InterruptedException e) 
{<a name="line.225"></a>
-<span class="sourceLineNo">226</span>        throw (InterruptedIOException)new 
InterruptedIOException().initCause(e);<a name="line.226"></a>
-<span class="sourceLineNo">227</span>      }<a name="line.227"></a>
-<span class="sourceLineNo">228</span>    }<a name="line.228"></a>
-<span class="sourceLineNo">229</span>  }<a name="line.229"></a>
-<span class="sourceLineNo">230</span><a name="line.230"></a>
-<span class="sourceLineNo">231</span>  /**<a name="line.231"></a>
-<span class="sourceLineNo">232</span>   * @param masters<a name="line.232"></a>
-<span class="sourceLineNo">233</span>   * @param regionservers<a 
name="line.233"></a>
-<span class="sourceLineNo">234</span>   */<a name="line.234"></a>
-<span class="sourceLineNo">235</span>  public static void shutdown(final 
List&lt;MasterThread&gt; masters,<a name="line.235"></a>
-<span class="sourceLineNo">236</span>      final 
List&lt;RegionServerThread&gt; regionservers) {<a name="line.236"></a>
-<span class="sourceLineNo">237</span>    LOG.debug("Shutting down HBase 
Cluster");<a name="line.237"></a>
-<span class="sourceLineNo">238</span>    if (masters != null) {<a 
name="line.238"></a>
-<span class="sourceLineNo">239</span>      // Do backups first.<a 
name="line.239"></a>
-<span class="sourceLineNo">240</span>      JVMClusterUtil.MasterThread 
activeMaster = null;<a name="line.240"></a>
-<span class="sourceLineNo">241</span>      for (JVMClusterUtil.MasterThread t 
: masters) {<a name="line.241"></a>
-<span class="sourceLineNo">242</span>        if (!t.master.isActiveMaster()) 
{<a name="line.242"></a>
-<span class="sourceLineNo">243</span>          try {<a name="line.243"></a>
-<span class="sourceLineNo">244</span>            t.master.stopMaster();<a 
name="line.244"></a>
-<span class="sourceLineNo">245</span>          } catch (IOException e) {<a 
name="line.245"></a>
-<span class="sourceLineNo">246</span>            LOG.error("Exception occurred 
while stopping master", e);<a name="line.246"></a>
-<span class="sourceLineNo">247</span>          }<a name="line.247"></a>
-<span class="sourceLineNo">248</span>        } else {<a name="line.248"></a>
-<span class="sourceLineNo">249</span>          activeMaster = t;<a 
name="line.249"></a>
-<span class="sourceLineNo">250</span>        }<a name="line.250"></a>
-<span class="sourceLineNo">251</span>      }<a name="line.251"></a>
-<span class="sourceLineNo">252</span>      // Do active after.<a 
name="line.252"></a>
-<span class="sourceLineNo">253</span>      if (activeMaster != null) {<a 
name="line.253"></a>
-<span class="sourceLineNo">254</span>        try {<a name="line.254"></a>
-<span class="sourceLineNo">255</span>          
activeMaster.master.shutdown();<a name="line.255"></a>
-<span class="sourceLineNo">256</span>        } catch (IOException e) {<a 
name="line.256"></a>
-<span class="sourceLineNo">257</span>          LOG.error("Exception occurred 
in HMaster.shutdown()", e);<a name="line.257"></a>
-<span class="sourceLineNo">258</span>        }<a name="line.258"></a>
-<span class="sourceLineNo">259</span>      }<a name="line.259"></a>
-<span class="sourceLineNo">260</span><a name="line.260"></a>
+<span class="sourceLineNo">190</span>        String msg = "Master not active 
after " + startTimeout + "ms";<a name="line.190"></a>
+<span class="sourceLineNo">191</span>        
Threads.printThreadInfo(System.out, "Thread dump because: " + msg);<a 
name="line.191"></a>
+<span class="sourceLineNo">192</span>        throw new 
RuntimeException(msg);<a name="line.192"></a>
+<span class="sourceLineNo">193</span>      }<a name="line.193"></a>
+<span class="sourceLineNo">194</span>    }<a name="line.194"></a>
+<span class="sourceLineNo">195</span><a name="line.195"></a>
+<span class="sourceLineNo">196</span>    if (regionservers != null) {<a 
name="line.196"></a>
+<span class="sourceLineNo">197</span>      for 
(JVMClusterUtil.RegionServerThread t: regionservers) {<a name="line.197"></a>
+<span class="sourceLineNo">198</span>        t.start();<a name="line.198"></a>
+<span class="sourceLineNo">199</span>      }<a name="line.199"></a>
+<span class="sourceLineNo">200</span>    }<a name="line.200"></a>
+<span class="sourceLineNo">201</span><a name="line.201"></a>
+<span class="sourceLineNo">202</span>    // Wait for an active master to be 
initialized (implies being master)<a name="line.202"></a>
+<span class="sourceLineNo">203</span>    //  with this, when we return the 
cluster is complete<a name="line.203"></a>
+<span class="sourceLineNo">204</span>    startTime = 
System.currentTimeMillis();<a name="line.204"></a>
+<span class="sourceLineNo">205</span>    final int maxwait = 200000;<a 
name="line.205"></a>
+<span class="sourceLineNo">206</span>    while (true) {<a name="line.206"></a>
+<span class="sourceLineNo">207</span>      JVMClusterUtil.MasterThread t = 
findActiveMaster(masters);<a name="line.207"></a>
+<span class="sourceLineNo">208</span>      if (t != null &amp;&amp; 
t.master.isInitialized()) {<a name="line.208"></a>
+<span class="sourceLineNo">209</span>        return 
t.master.getServerName().toString();<a name="line.209"></a>
+<span class="sourceLineNo">210</span>      }<a name="line.210"></a>
+<span class="sourceLineNo">211</span>      // REMOVE<a name="line.211"></a>
+<span class="sourceLineNo">212</span>      if (System.currentTimeMillis() &gt; 
startTime + 10000) {<a name="line.212"></a>
+<span class="sourceLineNo">213</span>        try {<a name="line.213"></a>
+<span class="sourceLineNo">214</span>          Thread.sleep(1000);<a 
name="line.214"></a>
+<span class="sourceLineNo">215</span>        } catch (InterruptedException e) 
{<a name="line.215"></a>
+<span class="sourceLineNo">216</span>          throw 
(InterruptedIOException)new InterruptedIOException().initCause(e);<a 
name="line.216"></a>
+<span class="sourceLineNo">217</span>        }<a name="line.217"></a>
+<span class="sourceLineNo">218</span>      }<a name="line.218"></a>
+<span class="sourceLineNo">219</span>      if (System.currentTimeMillis() &gt; 
startTime + maxwait) {<a name="line.219"></a>
+<span class="sourceLineNo">220</span>        String msg = "Master not 
initialized after " + maxwait + "ms seconds";<a name="line.220"></a>
+<span class="sourceLineNo">221</span>        
Threads.printThreadInfo(System.out, "Thread dump because: " + msg);<a 
name="line.221"></a>
+<span class="sourceLineNo">222</span>        throw new 
RuntimeException(msg);<a name="line.222"></a>
+<span class="sourceLineNo">223</span>      }<a name="line.223"></a>
+<span class="sourceLineNo">224</span>      try {<a name="line.224"></a>
+<span class="sourceLineNo">225</span>        Thread.sleep(100);<a 
name="line.225"></a>
+<span class="sourceLineNo">226</span>      } catch (InterruptedException e) 
{<a name="line.226"></a>
+<span class="sourceLineNo">227</span>        throw (InterruptedIOException)new 
InterruptedIOException().initCause(e);<a name="line.227"></a>
+<span class="sourceLineNo">228</span>      }<a name="line.228"></a>
+<span class="sourceLineNo">229</span>    }<a name="line.229"></a>
+<span class="sourceLineNo">230</span>  }<a name="line.230"></a>
+<span class="sourceLineNo">231</span><a name="line.231"></a>
+<span class="sourceLineNo">232</span>  /**<a name="line.232"></a>
+<span class="sourceLineNo">233</span>   * @param masters<a name="line.233"></a>
+<span class="sourceLineNo">234</span>   * @param regionservers<a 
name="line.234"></a>
+<span class="sourceLineNo">235</span>   */<a name="line.235"></a>
+<span class="sourceLineNo">236</span>  public static void shutdown(final 
List&lt;MasterThread&gt; masters,<a name="line.236"></a>
+<span class="sourceLineNo">237</span>      final 
List&lt;RegionServerThread&gt; regionservers) {<a name="line.237"></a>
+<span class="sourceLineNo">238</span>    LOG.debug("Shutting down HBase 
Cluster");<a name="line.238"></a>
+<span class="sourceLineNo">239</span>    if (masters != null) {<a 
name="line.239"></a>
+<span class="sourceLineNo">240</span>      // Do backups first.<a 
name="line.240"></a>
+<span class="sourceLineNo">241</span>      JVMClusterUtil.MasterThread 
activeMaster = null;<a name="line.241"></a>
+<span class="sourceLineNo">242</span>      for (JVMClusterUtil.MasterThread t 
: masters) {<a name="line.242"></a>
+<span class="sourceLineNo">243</span>        if (!t.master.isActiveMaster()) 
{<a name="line.243"></a>
+<span class="sourceLineNo">244</span>          try {<a name="line.244"></a>
+<span class="sourceLineNo">245</span>            t.master.stopMaster();<a 
name="line.245"></a>
+<span class="sourceLineNo">246</span>          } catch (IOException e) {<a 
name="line.246"></a>
+<span class="sourceLineNo">247</span>            LOG.error("Exception occurred 
while stopping master", e);<a name="line.247"></a>
+<span class="sourceLineNo">248</span>          }<a name="line.248"></a>
+<span class="sourceLineNo">249</span>        } else {<a name="line.249"></a>
+<span class="sourceLineNo">250</span>          activeMaster = t;<a 
name="line.250"></a>
+<span class="sourceLineNo">251</span>        }<a name="line.251"></a>
+<span class="sourceLineNo">252</span>      }<a name="line.252"></a>
+<span class="sourceLineNo">253</span>      // Do active after.<a 
name="line.253"></a>
+<span class="sourceLineNo">254</span>      if (activeMaster != null) {<a 
name="line.254"></a>
+<span class="sourceLineNo">255</span>        try {<a name="line.255"></a>
+<span class="sourceLineNo">256</span>          
activeMaster.master.shutdown();<a name="line.256"></a>
+<span class="sourceLineNo">257</span>        } catch (IOException e) {<a 
name="line.257"></a>
+<span class="sourceLineNo">258</span>          LOG.error("Exception occurred 
in HMaster.shutdown()", e);<a name="line.258"></a>
+<span class="sourceLineNo">259</span>        }<a name="line.259"></a>
+<span class="sourceLineNo">260</span>      }<a name="line.260"></a>
 <span class="sourceLineNo">261</span>    }<a name="line.261"></a>
 <span class="sourceLineNo">262</span>    boolean wasInterrupted = false;<a 
name="line.262"></a>
 <span class="sourceLineNo">263</span>    final long maxTime = 
System.currentTimeMillis() + 30 * 1000;<a name="line.263"></a>

Reply via email to