http://git-wip-us.apache.org/repos/asf/hbase-site/blob/b3b50f22/devapidocs/src-html/org/apache/hadoop/hbase/master/MasterServices.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/MasterServices.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/MasterServices.html index 912d069..e50b37b 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/master/MasterServices.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/MasterServices.html @@ -521,7 +521,11 @@ <span class="sourceLineNo">513</span> * @return {@link LockManager} to lock namespaces/tables/regions.<a name="line.513"></a> <span class="sourceLineNo">514</span> */<a name="line.514"></a> <span class="sourceLineNo">515</span> LockManager getLockManager();<a name="line.515"></a> -<span class="sourceLineNo">516</span>}<a name="line.516"></a> +<span class="sourceLineNo">516</span><a name="line.516"></a> +<span class="sourceLineNo">517</span> public String getRegionServerVersion(final ServerName sn);<a name="line.517"></a> +<span class="sourceLineNo">518</span><a name="line.518"></a> +<span class="sourceLineNo">519</span> public void checkIfShouldMoveSystemRegionAsync();<a name="line.519"></a> +<span class="sourceLineNo">520</span>}<a name="line.520"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/b3b50f22/devapidocs/src-html/org/apache/hadoop/hbase/master/ServerManager.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/ServerManager.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/ServerManager.html index 65900b3..4de2702 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/master/ServerManager.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/ServerManager.html @@ -1214,13 +1214,13 @@ <span class="sourceLineNo">1206</span> /**<a name="line.1206"></a> <span class="sourceLineNo">1207</span> * Creates a list of possible destinations for a region. It contains the online servers, but not<a name="line.1207"></a> <span class="sourceLineNo">1208</span> * the draining or dying servers.<a name="line.1208"></a> -<span class="sourceLineNo">1209</span> * @param serverToExclude can be null if there is no server to exclude<a name="line.1209"></a> +<span class="sourceLineNo">1209</span> * @param serversToExclude can be null if there is no server to exclude<a name="line.1209"></a> <span class="sourceLineNo">1210</span> */<a name="line.1210"></a> -<span class="sourceLineNo">1211</span> public List<ServerName> createDestinationServersList(final ServerName serverToExclude){<a name="line.1211"></a> +<span class="sourceLineNo">1211</span> public List<ServerName> createDestinationServersList(final List<ServerName> serversToExclude){<a name="line.1211"></a> <span class="sourceLineNo">1212</span> final List<ServerName> destServers = getOnlineServersList();<a name="line.1212"></a> <span class="sourceLineNo">1213</span><a name="line.1213"></a> -<span class="sourceLineNo">1214</span> if (serverToExclude != null){<a name="line.1214"></a> -<span class="sourceLineNo">1215</span> destServers.remove(serverToExclude);<a name="line.1215"></a> +<span class="sourceLineNo">1214</span> if (serversToExclude != null){<a name="line.1214"></a> +<span class="sourceLineNo">1215</span> destServers.removeAll(serversToExclude);<a name="line.1215"></a> <span class="sourceLineNo">1216</span> }<a name="line.1216"></a> <span class="sourceLineNo">1217</span><a name="line.1217"></a> <span class="sourceLineNo">1218</span> // Loop through the draining server list and remove them from the server list<a name="line.1218"></a>
