You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by gi...@apache.org on 2017/12/01 15:18:33 UTC
[18/50] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/a5c4dca3/devapidocs/src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.FailedOpenUpdaterThread.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.FailedOpenUpdaterThread.html b/devapidocs/src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.FailedOpenUpdaterThread.html
index 775301c..0c071a7 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.FailedOpenUpdaterThread.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.FailedOpenUpdaterThread.html
@@ -317,602 +317,628 @@
<span class="sourceLineNo">309</span> flushConfig(newGroupMap);<a name="line.309"></a>
<span class="sourceLineNo">310</span> }<a name="line.310"></a>
<span class="sourceLineNo">311</span><a name="line.311"></a>
-<span class="sourceLineNo">312</span> List<RSGroupInfo> retrieveGroupListFromGroupTable() throws IOException {<a name="line.312"></a>
-<span class="sourceLineNo">313</span> List<RSGroupInfo> rsGroupInfoList = Lists.newArrayList();<a name="line.313"></a>
-<span class="sourceLineNo">314</span> for (Result result : rsGroupTable.getScanner(new Scan())) {<a name="line.314"></a>
-<span class="sourceLineNo">315</span> RSGroupProtos.RSGroupInfo proto = RSGroupProtos.RSGroupInfo.parseFrom(<a name="line.315"></a>
-<span class="sourceLineNo">316</span> result.getValue(META_FAMILY_BYTES, META_QUALIFIER_BYTES));<a name="line.316"></a>
-<span class="sourceLineNo">317</span> rsGroupInfoList.add(RSGroupProtobufUtil.toGroupInfo(proto));<a name="line.317"></a>
-<span class="sourceLineNo">318</span> }<a name="line.318"></a>
-<span class="sourceLineNo">319</span> return rsGroupInfoList;<a name="line.319"></a>
-<span class="sourceLineNo">320</span> }<a name="line.320"></a>
-<span class="sourceLineNo">321</span><a name="line.321"></a>
-<span class="sourceLineNo">322</span> List<RSGroupInfo> retrieveGroupListFromZookeeper() throws IOException {<a name="line.322"></a>
-<span class="sourceLineNo">323</span> String groupBasePath = ZNodePaths.joinZNode(watcher.znodePaths.baseZNode, rsGroupZNode);<a name="line.323"></a>
-<span class="sourceLineNo">324</span> List<RSGroupInfo> RSGroupInfoList = Lists.newArrayList();<a name="line.324"></a>
-<span class="sourceLineNo">325</span> //Overwrite any info stored by table, this takes precedence<a name="line.325"></a>
-<span class="sourceLineNo">326</span> try {<a name="line.326"></a>
-<span class="sourceLineNo">327</span> if(ZKUtil.checkExists(watcher, groupBasePath) != -1) {<a name="line.327"></a>
-<span class="sourceLineNo">328</span> for(String znode: ZKUtil.listChildrenAndWatchForNewChildren(watcher, groupBasePath)) {<a name="line.328"></a>
-<span class="sourceLineNo">329</span> byte[] data = ZKUtil.getData(watcher, ZNodePaths.joinZNode(groupBasePath, znode));<a name="line.329"></a>
-<span class="sourceLineNo">330</span> if(data.length > 0) {<a name="line.330"></a>
-<span class="sourceLineNo">331</span> ProtobufUtil.expectPBMagicPrefix(data);<a name="line.331"></a>
-<span class="sourceLineNo">332</span> ByteArrayInputStream bis = new ByteArrayInputStream(<a name="line.332"></a>
-<span class="sourceLineNo">333</span> data, ProtobufUtil.lengthOfPBMagic(), data.length);<a name="line.333"></a>
-<span class="sourceLineNo">334</span> RSGroupInfoList.add(RSGroupProtobufUtil.toGroupInfo(<a name="line.334"></a>
-<span class="sourceLineNo">335</span> RSGroupProtos.RSGroupInfo.parseFrom(bis)));<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> LOG.debug("Read ZK GroupInfo count:" + RSGroupInfoList.size());<a name="line.338"></a>
-<span class="sourceLineNo">339</span> }<a name="line.339"></a>
-<span class="sourceLineNo">340</span> } catch (KeeperException|DeserializationException|InterruptedException e) {<a name="line.340"></a>
-<span class="sourceLineNo">341</span> throw new IOException("Failed to read rsGroupZNode",e);<a name="line.341"></a>
-<span class="sourceLineNo">342</span> }<a name="line.342"></a>
-<span class="sourceLineNo">343</span> return RSGroupInfoList;<a name="line.343"></a>
-<span class="sourceLineNo">344</span> }<a name="line.344"></a>
-<span class="sourceLineNo">345</span><a name="line.345"></a>
-<span class="sourceLineNo">346</span> @Override<a name="line.346"></a>
-<span class="sourceLineNo">347</span> public void refresh() throws IOException {<a name="line.347"></a>
-<span class="sourceLineNo">348</span> refresh(false);<a name="line.348"></a>
-<span class="sourceLineNo">349</span> }<a name="line.349"></a>
-<span class="sourceLineNo">350</span><a name="line.350"></a>
-<span class="sourceLineNo">351</span> /**<a name="line.351"></a>
-<span class="sourceLineNo">352</span> * Read rsgroup info from the source of truth, the hbase:rsgroup table.<a name="line.352"></a>
-<span class="sourceLineNo">353</span> * Update zk cache. Called on startup of the manager.<a name="line.353"></a>
-<span class="sourceLineNo">354</span> */<a name="line.354"></a>
-<span class="sourceLineNo">355</span> private synchronized void refresh(boolean forceOnline) throws IOException {<a name="line.355"></a>
-<span class="sourceLineNo">356</span> List<RSGroupInfo> groupList = new LinkedList<>();<a name="line.356"></a>
-<span class="sourceLineNo">357</span><a name="line.357"></a>
-<span class="sourceLineNo">358</span> // Overwrite anything read from zk, group table is source of truth<a name="line.358"></a>
-<span class="sourceLineNo">359</span> // if online read from GROUP table<a name="line.359"></a>
-<span class="sourceLineNo">360</span> if (forceOnline || isOnline()) {<a name="line.360"></a>
-<span class="sourceLineNo">361</span> LOG.debug("Refreshing in Online mode.");<a name="line.361"></a>
-<span class="sourceLineNo">362</span> if (rsGroupTable == null) {<a name="line.362"></a>
-<span class="sourceLineNo">363</span> rsGroupTable = conn.getTable(RSGROUP_TABLE_NAME);<a name="line.363"></a>
-<span class="sourceLineNo">364</span> }<a name="line.364"></a>
-<span class="sourceLineNo">365</span> groupList.addAll(retrieveGroupListFromGroupTable());<a name="line.365"></a>
-<span class="sourceLineNo">366</span> } else {<a name="line.366"></a>
-<span class="sourceLineNo">367</span> LOG.debug("Refreshing in Offline mode.");<a name="line.367"></a>
-<span class="sourceLineNo">368</span> groupList.addAll(retrieveGroupListFromZookeeper());<a name="line.368"></a>
-<span class="sourceLineNo">369</span> }<a name="line.369"></a>
-<span class="sourceLineNo">370</span><a name="line.370"></a>
-<span class="sourceLineNo">371</span> // refresh default group, prune<a name="line.371"></a>
-<span class="sourceLineNo">372</span> NavigableSet<TableName> orphanTables = new TreeSet<>();<a name="line.372"></a>
-<span class="sourceLineNo">373</span> for(String entry: masterServices.getTableDescriptors().getAll().keySet()) {<a name="line.373"></a>
-<span class="sourceLineNo">374</span> orphanTables.add(TableName.valueOf(entry));<a name="line.374"></a>
-<span class="sourceLineNo">375</span> }<a name="line.375"></a>
+<span class="sourceLineNo">312</span> @Override<a name="line.312"></a>
+<span class="sourceLineNo">313</span> public synchronized void removeServers(Set<Address> servers) throws IOException {<a name="line.313"></a>
+<span class="sourceLineNo">314</span> Map<String, RSGroupInfo> rsGroupInfos = new HashMap<String, RSGroupInfo>();<a name="line.314"></a>
+<span class="sourceLineNo">315</span> for (Address el: servers) {<a name="line.315"></a>
+<span class="sourceLineNo">316</span> RSGroupInfo rsGroupInfo = getRSGroupOfServer(el);<a name="line.316"></a>
+<span class="sourceLineNo">317</span> if (rsGroupInfo != null) {<a name="line.317"></a>
+<span class="sourceLineNo">318</span> RSGroupInfo newRsGroupInfo = rsGroupInfos.get(rsGroupInfo.getName());<a name="line.318"></a>
+<span class="sourceLineNo">319</span> if (newRsGroupInfo == null) {<a name="line.319"></a>
+<span class="sourceLineNo">320</span> rsGroupInfo.removeServer(el);<a name="line.320"></a>
+<span class="sourceLineNo">321</span> rsGroupInfos.put(rsGroupInfo.getName(), rsGroupInfo);<a name="line.321"></a>
+<span class="sourceLineNo">322</span> } else {<a name="line.322"></a>
+<span class="sourceLineNo">323</span> newRsGroupInfo.removeServer(el);<a name="line.323"></a>
+<span class="sourceLineNo">324</span> rsGroupInfos.put(newRsGroupInfo.getName(), newRsGroupInfo);<a name="line.324"></a>
+<span class="sourceLineNo">325</span> }<a name="line.325"></a>
+<span class="sourceLineNo">326</span> }else {<a name="line.326"></a>
+<span class="sourceLineNo">327</span> LOG.warn("Server " + el + " does not belong to any rsgroup.");<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><a name="line.330"></a>
+<span class="sourceLineNo">331</span> if (rsGroupInfos.size() > 0) {<a name="line.331"></a>
+<span class="sourceLineNo">332</span> Map<String, RSGroupInfo> newGroupMap = Maps.newHashMap(rsGroupMap);<a name="line.332"></a>
+<span class="sourceLineNo">333</span> newGroupMap.putAll(rsGroupInfos);<a name="line.333"></a>
+<span class="sourceLineNo">334</span> flushConfig(newGroupMap);<a name="line.334"></a>
+<span class="sourceLineNo">335</span> }<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> List<RSGroupInfo> retrieveGroupListFromGroupTable() throws IOException {<a name="line.338"></a>
+<span class="sourceLineNo">339</span> List<RSGroupInfo> rsGroupInfoList = Lists.newArrayList();<a name="line.339"></a>
+<span class="sourceLineNo">340</span> for (Result result : rsGroupTable.getScanner(new Scan())) {<a name="line.340"></a>
+<span class="sourceLineNo">341</span> RSGroupProtos.RSGroupInfo proto = RSGroupProtos.RSGroupInfo.parseFrom(<a name="line.341"></a>
+<span class="sourceLineNo">342</span> result.getValue(META_FAMILY_BYTES, META_QUALIFIER_BYTES));<a name="line.342"></a>
+<span class="sourceLineNo">343</span> rsGroupInfoList.add(RSGroupProtobufUtil.toGroupInfo(proto));<a name="line.343"></a>
+<span class="sourceLineNo">344</span> }<a name="line.344"></a>
+<span class="sourceLineNo">345</span> return rsGroupInfoList;<a name="line.345"></a>
+<span class="sourceLineNo">346</span> }<a name="line.346"></a>
+<span class="sourceLineNo">347</span><a name="line.347"></a>
+<span class="sourceLineNo">348</span> List<RSGroupInfo> retrieveGroupListFromZookeeper() throws IOException {<a name="line.348"></a>
+<span class="sourceLineNo">349</span> String groupBasePath = ZNodePaths.joinZNode(watcher.znodePaths.baseZNode, rsGroupZNode);<a name="line.349"></a>
+<span class="sourceLineNo">350</span> List<RSGroupInfo> RSGroupInfoList = Lists.newArrayList();<a name="line.350"></a>
+<span class="sourceLineNo">351</span> //Overwrite any info stored by table, this takes precedence<a name="line.351"></a>
+<span class="sourceLineNo">352</span> try {<a name="line.352"></a>
+<span class="sourceLineNo">353</span> if(ZKUtil.checkExists(watcher, groupBasePath) != -1) {<a name="line.353"></a>
+<span class="sourceLineNo">354</span> for(String znode: ZKUtil.listChildrenAndWatchForNewChildren(watcher, groupBasePath)) {<a name="line.354"></a>
+<span class="sourceLineNo">355</span> byte[] data = ZKUtil.getData(watcher, ZNodePaths.joinZNode(groupBasePath, znode));<a name="line.355"></a>
+<span class="sourceLineNo">356</span> if(data.length > 0) {<a name="line.356"></a>
+<span class="sourceLineNo">357</span> ProtobufUtil.expectPBMagicPrefix(data);<a name="line.357"></a>
+<span class="sourceLineNo">358</span> ByteArrayInputStream bis = new ByteArrayInputStream(<a name="line.358"></a>
+<span class="sourceLineNo">359</span> data, ProtobufUtil.lengthOfPBMagic(), data.length);<a name="line.359"></a>
+<span class="sourceLineNo">360</span> RSGroupInfoList.add(RSGroupProtobufUtil.toGroupInfo(<a name="line.360"></a>
+<span class="sourceLineNo">361</span> RSGroupProtos.RSGroupInfo.parseFrom(bis)));<a name="line.361"></a>
+<span class="sourceLineNo">362</span> }<a name="line.362"></a>
+<span class="sourceLineNo">363</span> }<a name="line.363"></a>
+<span class="sourceLineNo">364</span> LOG.debug("Read ZK GroupInfo count:" + RSGroupInfoList.size());<a name="line.364"></a>
+<span class="sourceLineNo">365</span> }<a name="line.365"></a>
+<span class="sourceLineNo">366</span> } catch (KeeperException|DeserializationException|InterruptedException e) {<a name="line.366"></a>
+<span class="sourceLineNo">367</span> throw new IOException("Failed to read rsGroupZNode",e);<a name="line.367"></a>
+<span class="sourceLineNo">368</span> }<a name="line.368"></a>
+<span class="sourceLineNo">369</span> return RSGroupInfoList;<a name="line.369"></a>
+<span class="sourceLineNo">370</span> }<a name="line.370"></a>
+<span class="sourceLineNo">371</span><a name="line.371"></a>
+<span class="sourceLineNo">372</span> @Override<a name="line.372"></a>
+<span class="sourceLineNo">373</span> public void refresh() throws IOException {<a name="line.373"></a>
+<span class="sourceLineNo">374</span> refresh(false);<a name="line.374"></a>
+<span class="sourceLineNo">375</span> }<a name="line.375"></a>
<span class="sourceLineNo">376</span><a name="line.376"></a>
-<span class="sourceLineNo">377</span> final List<TableName> specialTables;<a name="line.377"></a>
-<span class="sourceLineNo">378</span> if(!masterServices.isInitialized()) {<a name="line.378"></a>
-<span class="sourceLineNo">379</span> specialTables = Arrays.asList(AccessControlLists.ACL_TABLE_NAME, TableName.META_TABLE_NAME,<a name="line.379"></a>
-<span class="sourceLineNo">380</span> TableName.NAMESPACE_TABLE_NAME, RSGROUP_TABLE_NAME);<a name="line.380"></a>
-<span class="sourceLineNo">381</span> } else {<a name="line.381"></a>
-<span class="sourceLineNo">382</span> specialTables =<a name="line.382"></a>
-<span class="sourceLineNo">383</span> masterServices.listTableNamesByNamespace(NamespaceDescriptor.SYSTEM_NAMESPACE_NAME_STR);<a name="line.383"></a>
-<span class="sourceLineNo">384</span> }<a name="line.384"></a>
-<span class="sourceLineNo">385</span><a name="line.385"></a>
-<span class="sourceLineNo">386</span> for (TableName table : specialTables) {<a name="line.386"></a>
-<span class="sourceLineNo">387</span> orphanTables.add(table);<a name="line.387"></a>
-<span class="sourceLineNo">388</span> }<a name="line.388"></a>
-<span class="sourceLineNo">389</span> for (RSGroupInfo group: groupList) {<a name="line.389"></a>
-<span class="sourceLineNo">390</span> if(!group.getName().equals(RSGroupInfo.DEFAULT_GROUP)) {<a name="line.390"></a>
-<span class="sourceLineNo">391</span> orphanTables.removeAll(group.getTables());<a name="line.391"></a>
-<span class="sourceLineNo">392</span> }<a name="line.392"></a>
-<span class="sourceLineNo">393</span> }<a name="line.393"></a>
-<span class="sourceLineNo">394</span><a name="line.394"></a>
-<span class="sourceLineNo">395</span> // This is added to the last of the list so it overwrites the 'default' rsgroup loaded<a name="line.395"></a>
-<span class="sourceLineNo">396</span> // from region group table or zk<a name="line.396"></a>
-<span class="sourceLineNo">397</span> groupList.add(new RSGroupInfo(RSGroupInfo.DEFAULT_GROUP, getDefaultServers(),<a name="line.397"></a>
-<span class="sourceLineNo">398</span> orphanTables));<a name="line.398"></a>
-<span class="sourceLineNo">399</span><a name="line.399"></a>
-<span class="sourceLineNo">400</span> // populate the data<a name="line.400"></a>
-<span class="sourceLineNo">401</span> HashMap<String, RSGroupInfo> newGroupMap = Maps.newHashMap();<a name="line.401"></a>
-<span class="sourceLineNo">402</span> HashMap<TableName, String> newTableMap = Maps.newHashMap();<a name="line.402"></a>
-<span class="sourceLineNo">403</span> for (RSGroupInfo group : groupList) {<a name="line.403"></a>
-<span class="sourceLineNo">404</span> newGroupMap.put(group.getName(), group);<a name="line.404"></a>
-<span class="sourceLineNo">405</span> for(TableName table: group.getTables()) {<a name="line.405"></a>
-<span class="sourceLineNo">406</span> newTableMap.put(table, group.getName());<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> resetRSGroupAndTableMaps(newGroupMap, newTableMap);<a name="line.409"></a>
-<span class="sourceLineNo">410</span> updateCacheOfRSGroups(rsGroupMap.keySet());<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> private synchronized Map<TableName,String> flushConfigTable(Map<String,RSGroupInfo> groupMap)<a name="line.413"></a>
-<span class="sourceLineNo">414</span> throws IOException {<a name="line.414"></a>
-<span class="sourceLineNo">415</span> Map<TableName,String> newTableMap = Maps.newHashMap();<a name="line.415"></a>
-<span class="sourceLineNo">416</span> List<Mutation> mutations = Lists.newArrayList();<a name="line.416"></a>
-<span class="sourceLineNo">417</span><a name="line.417"></a>
-<span class="sourceLineNo">418</span> // populate deletes<a name="line.418"></a>
-<span class="sourceLineNo">419</span> for(String groupName : prevRSGroups) {<a name="line.419"></a>
-<span class="sourceLineNo">420</span> if(!groupMap.containsKey(groupName)) {<a name="line.420"></a>
-<span class="sourceLineNo">421</span> Delete d = new Delete(Bytes.toBytes(groupName));<a name="line.421"></a>
-<span class="sourceLineNo">422</span> mutations.add(d);<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">377</span> /**<a name="line.377"></a>
+<span class="sourceLineNo">378</span> * Read rsgroup info from the source of truth, the hbase:rsgroup table.<a name="line.378"></a>
+<span class="sourceLineNo">379</span> * Update zk cache. Called on startup of the manager.<a name="line.379"></a>
+<span class="sourceLineNo">380</span> */<a name="line.380"></a>
+<span class="sourceLineNo">381</span> private synchronized void refresh(boolean forceOnline) throws IOException {<a name="line.381"></a>
+<span class="sourceLineNo">382</span> List<RSGroupInfo> groupList = new LinkedList<>();<a name="line.382"></a>
+<span class="sourceLineNo">383</span><a name="line.383"></a>
+<span class="sourceLineNo">384</span> // Overwrite anything read from zk, group table is source of truth<a name="line.384"></a>
+<span class="sourceLineNo">385</span> // if online read from GROUP table<a name="line.385"></a>
+<span class="sourceLineNo">386</span> if (forceOnline || isOnline()) {<a name="line.386"></a>
+<span class="sourceLineNo">387</span> LOG.debug("Refreshing in Online mode.");<a name="line.387"></a>
+<span class="sourceLineNo">388</span> if (rsGroupTable == null) {<a name="line.388"></a>
+<span class="sourceLineNo">389</span> rsGroupTable = conn.getTable(RSGROUP_TABLE_NAME);<a name="line.389"></a>
+<span class="sourceLineNo">390</span> }<a name="line.390"></a>
+<span class="sourceLineNo">391</span> groupList.addAll(retrieveGroupListFromGroupTable());<a name="line.391"></a>
+<span class="sourceLineNo">392</span> } else {<a name="line.392"></a>
+<span class="sourceLineNo">393</span> LOG.debug("Refreshing in Offline mode.");<a name="line.393"></a>
+<span class="sourceLineNo">394</span> groupList.addAll(retrieveGroupListFromZookeeper());<a name="line.394"></a>
+<span class="sourceLineNo">395</span> }<a name="line.395"></a>
+<span class="sourceLineNo">396</span><a name="line.396"></a>
+<span class="sourceLineNo">397</span> // refresh default group, prune<a name="line.397"></a>
+<span class="sourceLineNo">398</span> NavigableSet<TableName> orphanTables = new TreeSet<>();<a name="line.398"></a>
+<span class="sourceLineNo">399</span> for(String entry: masterServices.getTableDescriptors().getAll().keySet()) {<a name="line.399"></a>
+<span class="sourceLineNo">400</span> orphanTables.add(TableName.valueOf(entry));<a name="line.400"></a>
+<span class="sourceLineNo">401</span> }<a name="line.401"></a>
+<span class="sourceLineNo">402</span><a name="line.402"></a>
+<span class="sourceLineNo">403</span> final List<TableName> specialTables;<a name="line.403"></a>
+<span class="sourceLineNo">404</span> if(!masterServices.isInitialized()) {<a name="line.404"></a>
+<span class="sourceLineNo">405</span> specialTables = Arrays.asList(AccessControlLists.ACL_TABLE_NAME, TableName.META_TABLE_NAME,<a name="line.405"></a>
+<span class="sourceLineNo">406</span> TableName.NAMESPACE_TABLE_NAME, RSGROUP_TABLE_NAME);<a name="line.406"></a>
+<span class="sourceLineNo">407</span> } else {<a name="line.407"></a>
+<span class="sourceLineNo">408</span> specialTables =<a name="line.408"></a>
+<span class="sourceLineNo">409</span> masterServices.listTableNamesByNamespace(NamespaceDescriptor.SYSTEM_NAMESPACE_NAME_STR);<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> for (TableName table : specialTables) {<a name="line.412"></a>
+<span class="sourceLineNo">413</span> orphanTables.add(table);<a name="line.413"></a>
+<span class="sourceLineNo">414</span> }<a name="line.414"></a>
+<span class="sourceLineNo">415</span> for (RSGroupInfo group: groupList) {<a name="line.415"></a>
+<span class="sourceLineNo">416</span> if(!group.getName().equals(RSGroupInfo.DEFAULT_GROUP)) {<a name="line.416"></a>
+<span class="sourceLineNo">417</span> orphanTables.removeAll(group.getTables());<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><a name="line.420"></a>
+<span class="sourceLineNo">421</span> // This is added to the last of the list so it overwrites the 'default' rsgroup loaded<a name="line.421"></a>
+<span class="sourceLineNo">422</span> // from region group table or zk<a name="line.422"></a>
+<span class="sourceLineNo">423</span> groupList.add(new RSGroupInfo(RSGroupInfo.DEFAULT_GROUP, getDefaultServers(),<a name="line.423"></a>
+<span class="sourceLineNo">424</span> orphanTables));<a name="line.424"></a>
<span class="sourceLineNo">425</span><a name="line.425"></a>
-<span class="sourceLineNo">426</span> // populate puts<a name="line.426"></a>
-<span class="sourceLineNo">427</span> for(RSGroupInfo RSGroupInfo : groupMap.values()) {<a name="line.427"></a>
-<span class="sourceLineNo">428</span> RSGroupProtos.RSGroupInfo proto = RSGroupProtobufUtil.toProtoGroupInfo(RSGroupInfo);<a name="line.428"></a>
-<span class="sourceLineNo">429</span> Put p = new Put(Bytes.toBytes(RSGroupInfo.getName()));<a name="line.429"></a>
-<span class="sourceLineNo">430</span> p.addColumn(META_FAMILY_BYTES, META_QUALIFIER_BYTES, proto.toByteArray());<a name="line.430"></a>
-<span class="sourceLineNo">431</span> mutations.add(p);<a name="line.431"></a>
-<span class="sourceLineNo">432</span> for(TableName entry: RSGroupInfo.getTables()) {<a name="line.432"></a>
-<span class="sourceLineNo">433</span> newTableMap.put(entry, RSGroupInfo.getName());<a name="line.433"></a>
-<span class="sourceLineNo">434</span> }<a name="line.434"></a>
-<span class="sourceLineNo">435</span> }<a name="line.435"></a>
-<span class="sourceLineNo">436</span><a name="line.436"></a>
-<span class="sourceLineNo">437</span> if(mutations.size() > 0) {<a name="line.437"></a>
-<span class="sourceLineNo">438</span> multiMutate(mutations);<a name="line.438"></a>
-<span class="sourceLineNo">439</span> }<a name="line.439"></a>
-<span class="sourceLineNo">440</span> return newTableMap;<a name="line.440"></a>
-<span class="sourceLineNo">441</span> }<a name="line.441"></a>
-<span class="sourceLineNo">442</span><a name="line.442"></a>
-<span class="sourceLineNo">443</span> private synchronized void flushConfig()<a name="line.443"></a>
-<span class="sourceLineNo">444</span> throws IOException {<a name="line.444"></a>
-<span class="sourceLineNo">445</span> flushConfig(this.rsGroupMap);<a name="line.445"></a>
-<span class="sourceLineNo">446</span> }<a name="line.446"></a>
-<span class="sourceLineNo">447</span><a name="line.447"></a>
-<span class="sourceLineNo">448</span> private synchronized void flushConfig(Map<String, RSGroupInfo> newGroupMap)<a name="line.448"></a>
-<span class="sourceLineNo">449</span> throws IOException {<a name="line.449"></a>
-<span class="sourceLineNo">450</span> Map<TableName, String> newTableMap;<a name="line.450"></a>
+<span class="sourceLineNo">426</span> // populate the data<a name="line.426"></a>
+<span class="sourceLineNo">427</span> HashMap<String, RSGroupInfo> newGroupMap = Maps.newHashMap();<a name="line.427"></a>
+<span class="sourceLineNo">428</span> HashMap<TableName, String> newTableMap = Maps.newHashMap();<a name="line.428"></a>
+<span class="sourceLineNo">429</span> for (RSGroupInfo group : groupList) {<a name="line.429"></a>
+<span class="sourceLineNo">430</span> newGroupMap.put(group.getName(), group);<a name="line.430"></a>
+<span class="sourceLineNo">431</span> for(TableName table: group.getTables()) {<a name="line.431"></a>
+<span class="sourceLineNo">432</span> newTableMap.put(table, group.getName());<a name="line.432"></a>
+<span class="sourceLineNo">433</span> }<a name="line.433"></a>
+<span class="sourceLineNo">434</span> }<a name="line.434"></a>
+<span class="sourceLineNo">435</span> resetRSGroupAndTableMaps(newGroupMap, newTableMap);<a name="line.435"></a>
+<span class="sourceLineNo">436</span> updateCacheOfRSGroups(rsGroupMap.keySet());<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>
+<span class="sourceLineNo">439</span> private synchronized Map<TableName,String> flushConfigTable(Map<String,RSGroupInfo> groupMap)<a name="line.439"></a>
+<span class="sourceLineNo">440</span> throws IOException {<a name="line.440"></a>
+<span class="sourceLineNo">441</span> Map<TableName,String> newTableMap = Maps.newHashMap();<a name="line.441"></a>
+<span class="sourceLineNo">442</span> List<Mutation> mutations = Lists.newArrayList();<a name="line.442"></a>
+<span class="sourceLineNo">443</span><a name="line.443"></a>
+<span class="sourceLineNo">444</span> // populate deletes<a name="line.444"></a>
+<span class="sourceLineNo">445</span> for(String groupName : prevRSGroups) {<a name="line.445"></a>
+<span class="sourceLineNo">446</span> if(!groupMap.containsKey(groupName)) {<a name="line.446"></a>
+<span class="sourceLineNo">447</span> Delete d = new Delete(Bytes.toBytes(groupName));<a name="line.447"></a>
+<span class="sourceLineNo">448</span> mutations.add(d);<a name="line.448"></a>
+<span class="sourceLineNo">449</span> }<a name="line.449"></a>
+<span class="sourceLineNo">450</span> }<a name="line.450"></a>
<span class="sourceLineNo">451</span><a name="line.451"></a>
-<span class="sourceLineNo">452</span> // For offline mode persistence is still unavailable<a name="line.452"></a>
-<span class="sourceLineNo">453</span> // We're refreshing in-memory state but only for default servers<a name="line.453"></a>
-<span class="sourceLineNo">454</span> if (!isOnline()) {<a name="line.454"></a>
-<span class="sourceLineNo">455</span> Map<String, RSGroupInfo> m = Maps.newHashMap(rsGroupMap);<a name="line.455"></a>
-<span class="sourceLineNo">456</span> RSGroupInfo oldDefaultGroup = m.remove(RSGroupInfo.DEFAULT_GROUP);<a name="line.456"></a>
-<span class="sourceLineNo">457</span> RSGroupInfo newDefaultGroup = newGroupMap.remove(RSGroupInfo.DEFAULT_GROUP);<a name="line.457"></a>
-<span class="sourceLineNo">458</span> if (!m.equals(newGroupMap) ||<a name="line.458"></a>
-<span class="sourceLineNo">459</span> !oldDefaultGroup.getTables().equals(newDefaultGroup.getTables())) {<a name="line.459"></a>
-<span class="sourceLineNo">460</span> throw new IOException("Only default servers can be updated during offline mode");<a name="line.460"></a>
-<span class="sourceLineNo">461</span> }<a name="line.461"></a>
-<span class="sourceLineNo">462</span> newGroupMap.put(RSGroupInfo.DEFAULT_GROUP, newDefaultGroup);<a name="line.462"></a>
-<span class="sourceLineNo">463</span> rsGroupMap = newGroupMap;<a name="line.463"></a>
-<span class="sourceLineNo">464</span> return;<a name="line.464"></a>
+<span class="sourceLineNo">452</span> // populate puts<a name="line.452"></a>
+<span class="sourceLineNo">453</span> for(RSGroupInfo RSGroupInfo : groupMap.values()) {<a name="line.453"></a>
+<span class="sourceLineNo">454</span> RSGroupProtos.RSGroupInfo proto = RSGroupProtobufUtil.toProtoGroupInfo(RSGroupInfo);<a name="line.454"></a>
+<span class="sourceLineNo">455</span> Put p = new Put(Bytes.toBytes(RSGroupInfo.getName()));<a name="line.455"></a>
+<span class="sourceLineNo">456</span> p.addColumn(META_FAMILY_BYTES, META_QUALIFIER_BYTES, proto.toByteArray());<a name="line.456"></a>
+<span class="sourceLineNo">457</span> mutations.add(p);<a name="line.457"></a>
+<span class="sourceLineNo">458</span> for(TableName entry: RSGroupInfo.getTables()) {<a name="line.458"></a>
+<span class="sourceLineNo">459</span> newTableMap.put(entry, RSGroupInfo.getName());<a name="line.459"></a>
+<span class="sourceLineNo">460</span> }<a name="line.460"></a>
+<span class="sourceLineNo">461</span> }<a name="line.461"></a>
+<span class="sourceLineNo">462</span><a name="line.462"></a>
+<span class="sourceLineNo">463</span> if(mutations.size() > 0) {<a name="line.463"></a>
+<span class="sourceLineNo">464</span> multiMutate(mutations);<a name="line.464"></a>
<span class="sourceLineNo">465</span> }<a name="line.465"></a>
-<span class="sourceLineNo">466</span><a name="line.466"></a>
-<span class="sourceLineNo">467</span> newTableMap = flushConfigTable(newGroupMap);<a name="line.467"></a>
+<span class="sourceLineNo">466</span> return newTableMap;<a name="line.466"></a>
+<span class="sourceLineNo">467</span> }<a name="line.467"></a>
<span class="sourceLineNo">468</span><a name="line.468"></a>
-<span class="sourceLineNo">469</span> // Make changes visible after having been persisted to the source of truth<a name="line.469"></a>
-<span class="sourceLineNo">470</span> resetRSGroupAndTableMaps(newGroupMap, newTableMap);<a name="line.470"></a>
-<span class="sourceLineNo">471</span><a name="line.471"></a>
-<span class="sourceLineNo">472</span> try {<a name="line.472"></a>
-<span class="sourceLineNo">473</span> String groupBasePath = ZNodePaths.joinZNode(watcher.znodePaths.baseZNode, rsGroupZNode);<a name="line.473"></a>
-<span class="sourceLineNo">474</span> ZKUtil.createAndFailSilent(watcher, groupBasePath, ProtobufMagic.PB_MAGIC);<a name="line.474"></a>
-<span class="sourceLineNo">475</span><a name="line.475"></a>
-<span class="sourceLineNo">476</span> List<ZKUtil.ZKUtilOp> zkOps = new ArrayList<>(newGroupMap.size());<a name="line.476"></a>
-<span class="sourceLineNo">477</span> for(String groupName : prevRSGroups) {<a name="line.477"></a>
-<span class="sourceLineNo">478</span> if(!newGroupMap.containsKey(groupName)) {<a name="line.478"></a>
-<span class="sourceLineNo">479</span> String znode = ZNodePaths.joinZNode(groupBasePath, groupName);<a name="line.479"></a>
-<span class="sourceLineNo">480</span> zkOps.add(ZKUtil.ZKUtilOp.deleteNodeFailSilent(znode));<a name="line.480"></a>
-<span class="sourceLineNo">481</span> }<a name="line.481"></a>
-<span class="sourceLineNo">482</span> }<a name="line.482"></a>
-<span class="sourceLineNo">483</span><a name="line.483"></a>
-<span class="sourceLineNo">484</span><a name="line.484"></a>
-<span class="sourceLineNo">485</span> for (RSGroupInfo RSGroupInfo : newGroupMap.values()) {<a name="line.485"></a>
-<span class="sourceLineNo">486</span> String znode = ZNodePaths.joinZNode(groupBasePath, RSGroupInfo.getName());<a name="line.486"></a>
-<span class="sourceLineNo">487</span> RSGroupProtos.RSGroupInfo proto = RSGroupProtobufUtil.toProtoGroupInfo(RSGroupInfo);<a name="line.487"></a>
-<span class="sourceLineNo">488</span> LOG.debug("Updating znode: "+znode);<a name="line.488"></a>
-<span class="sourceLineNo">489</span> ZKUtil.createAndFailSilent(watcher, znode);<a name="line.489"></a>
-<span class="sourceLineNo">490</span> zkOps.add(ZKUtil.ZKUtilOp.deleteNodeFailSilent(znode));<a name="line.490"></a>
-<span class="sourceLineNo">491</span> zkOps.add(ZKUtil.ZKUtilOp.createAndFailSilent(znode,<a name="line.491"></a>
-<span class="sourceLineNo">492</span> ProtobufUtil.prependPBMagic(proto.toByteArray())));<a name="line.492"></a>
-<span class="sourceLineNo">493</span> }<a name="line.493"></a>
-<span class="sourceLineNo">494</span> LOG.debug("Writing ZK GroupInfo count: " + zkOps.size());<a name="line.494"></a>
-<span class="sourceLineNo">495</span><a name="line.495"></a>
-<span class="sourceLineNo">496</span> ZKUtil.multiOrSequential(watcher, zkOps, false);<a name="line.496"></a>
-<span class="sourceLineNo">497</span> } catch (KeeperException e) {<a name="line.497"></a>
-<span class="sourceLineNo">498</span> LOG.error("Failed to write to rsGroupZNode", e);<a name="line.498"></a>
-<span class="sourceLineNo">499</span> masterServices.abort("Failed to write to rsGroupZNode", e);<a name="line.499"></a>
-<span class="sourceLineNo">500</span> throw new IOException("Failed to write to rsGroupZNode",e);<a name="line.500"></a>
-<span class="sourceLineNo">501</span> }<a name="line.501"></a>
-<span class="sourceLineNo">502</span> updateCacheOfRSGroups(newGroupMap.keySet());<a name="line.502"></a>
-<span class="sourceLineNo">503</span> }<a name="line.503"></a>
-<span class="sourceLineNo">504</span><a name="line.504"></a>
-<span class="sourceLineNo">505</span> /**<a name="line.505"></a>
-<span class="sourceLineNo">506</span> * Make changes visible.<a name="line.506"></a>
-<span class="sourceLineNo">507</span> * Caller must be synchronized on 'this'.<a name="line.507"></a>
-<span class="sourceLineNo">508</span> */<a name="line.508"></a>
-<span class="sourceLineNo">509</span> private void resetRSGroupAndTableMaps(Map<String, RSGroupInfo> newRSGroupMap,<a name="line.509"></a>
-<span class="sourceLineNo">510</span> Map<TableName, String> newTableMap) {<a name="line.510"></a>
-<span class="sourceLineNo">511</span> // Make maps Immutable.<a name="line.511"></a>
-<span class="sourceLineNo">512</span> this.rsGroupMap = Collections.unmodifiableMap(newRSGroupMap);<a name="line.512"></a>
-<span class="sourceLineNo">513</span> this.tableMap = Collections.unmodifiableMap(newTableMap);<a name="line.513"></a>
-<span class="sourceLineNo">514</span> }<a name="line.514"></a>
-<span class="sourceLineNo">515</span><a name="line.515"></a>
-<span class="sourceLineNo">516</span> /**<a name="line.516"></a>
-<span class="sourceLineNo">517</span> * Update cache of rsgroups.<a name="line.517"></a>
-<span class="sourceLineNo">518</span> * Caller must be synchronized on 'this'.<a name="line.518"></a>
-<span class="sourceLineNo">519</span> * @param currentGroups Current list of Groups.<a name="line.519"></a>
-<span class="sourceLineNo">520</span> */<a name="line.520"></a>
-<span class="sourceLineNo">521</span> private void updateCacheOfRSGroups(final Set<String> currentGroups) {<a name="line.521"></a>
-<span class="sourceLineNo">522</span> this.prevRSGroups.clear();<a name="line.522"></a>
-<span class="sourceLineNo">523</span> this.prevRSGroups.addAll(currentGroups);<a name="line.523"></a>
-<span class="sourceLineNo">524</span> }<a name="line.524"></a>
-<span class="sourceLineNo">525</span><a name="line.525"></a>
-<span class="sourceLineNo">526</span> // Called by getDefaultServers. Presume it has lock in place.<a name="line.526"></a>
-<span class="sourceLineNo">527</span> private List<ServerName> getOnlineRS() throws IOException {<a name="line.527"></a>
-<span class="sourceLineNo">528</span> if (masterServices != null) {<a name="line.528"></a>
-<span class="sourceLineNo">529</span> return masterServices.getServerManager().getOnlineServersList();<a name="line.529"></a>
-<span class="sourceLineNo">530</span> }<a name="line.530"></a>
-<span class="sourceLineNo">531</span> LOG.debug("Reading online RS from zookeeper");<a name="line.531"></a>
-<span class="sourceLineNo">532</span> List<ServerName> servers = new LinkedList<>();<a name="line.532"></a>
-<span class="sourceLineNo">533</span> try {<a name="line.533"></a>
-<span class="sourceLineNo">534</span> for (String el: ZKUtil.listChildrenNoWatch(watcher, watcher.znodePaths.rsZNode)) {<a name="line.534"></a>
-<span class="sourceLineNo">535</span> servers.add(ServerName.parseServerName(el));<a name="line.535"></a>
-<span class="sourceLineNo">536</span> }<a name="line.536"></a>
-<span class="sourceLineNo">537</span> } catch (KeeperException e) {<a name="line.537"></a>
-<span class="sourceLineNo">538</span> throw new IOException("Failed to retrieve server list from zookeeper", e);<a name="line.538"></a>
-<span class="sourceLineNo">539</span> }<a name="line.539"></a>
-<span class="sourceLineNo">540</span> return servers;<a name="line.540"></a>
-<span class="sourceLineNo">541</span> }<a name="line.541"></a>
-<span class="sourceLineNo">542</span><a name="line.542"></a>
-<span class="sourceLineNo">543</span> // Called by ServerEventsListenerThread. Presume it has lock on this manager when it runs.<a name="line.543"></a>
-<span class="sourceLineNo">544</span> private SortedSet<Address> getDefaultServers() throws IOException {<a name="line.544"></a>
-<span class="sourceLineNo">545</span> SortedSet<Address> defaultServers = Sets.newTreeSet();<a name="line.545"></a>
-<span class="sourceLineNo">546</span> for (ServerName serverName : getOnlineRS()) {<a name="line.546"></a>
-<span class="sourceLineNo">547</span> Address server =<a name="line.547"></a>
-<span class="sourceLineNo">548</span> Address.fromParts(serverName.getHostname(), serverName.getPort());<a name="line.548"></a>
-<span class="sourceLineNo">549</span> boolean found = false;<a name="line.549"></a>
-<span class="sourceLineNo">550</span> for(RSGroupInfo rsgi: listRSGroups()) {<a name="line.550"></a>
-<span class="sourceLineNo">551</span> if(!RSGroupInfo.DEFAULT_GROUP.equals(rsgi.getName()) &&<a name="line.551"></a>
-<span class="sourceLineNo">552</span> rsgi.containsServer(server)) {<a name="line.552"></a>
-<span class="sourceLineNo">553</span> found = true;<a name="line.553"></a>
-<span class="sourceLineNo">554</span> break;<a name="line.554"></a>
-<span class="sourceLineNo">555</span> }<a name="line.555"></a>
-<span class="sourceLineNo">556</span> }<a name="line.556"></a>
-<span class="sourceLineNo">557</span> if (!found) {<a name="line.557"></a>
-<span class="sourceLineNo">558</span> defaultServers.add(server);<a name="line.558"></a>
-<span class="sourceLineNo">559</span> }<a name="line.559"></a>
-<span class="sourceLineNo">560</span> }<a name="line.560"></a>
-<span class="sourceLineNo">561</span> return defaultServers;<a name="line.561"></a>
-<span class="sourceLineNo">562</span> }<a name="line.562"></a>
-<span class="sourceLineNo">563</span><a name="line.563"></a>
-<span class="sourceLineNo">564</span> // Called by ServerEventsListenerThread. Synchronize on this because redoing<a name="line.564"></a>
-<span class="sourceLineNo">565</span> // the rsGroupMap then writing it out.<a name="line.565"></a>
-<span class="sourceLineNo">566</span> private synchronized void updateDefaultServers(SortedSet<Address> servers) throws IOException {<a name="line.566"></a>
-<span class="sourceLineNo">567</span> RSGroupInfo info = rsGroupMap.get(RSGroupInfo.DEFAULT_GROUP);<a name="line.567"></a>
-<span class="sourceLineNo">568</span> RSGroupInfo newInfo = new RSGroupInfo(info.getName(), servers, info.getTables());<a name="line.568"></a>
-<span class="sourceLineNo">569</span> HashMap<String, RSGroupInfo> newGroupMap = Maps.newHashMap(rsGroupMap);<a name="line.569"></a>
-<span class="sourceLineNo">570</span> newGroupMap.put(newInfo.getName(), newInfo);<a name="line.570"></a>
-<span class="sourceLineNo">571</span> flushConfig(newGroupMap);<a name="line.571"></a>
-<span class="sourceLineNo">572</span> }<a name="line.572"></a>
-<span class="sourceLineNo">573</span><a name="line.573"></a>
-<span class="sourceLineNo">574</span> // Called by FailedOpenUpdaterThread<a name="line.574"></a>
-<span class="sourceLineNo">575</span> private void updateFailedAssignments() {<a name="line.575"></a>
-<span class="sourceLineNo">576</span> // Kick all regions in FAILED_OPEN state<a name="line.576"></a>
-<span class="sourceLineNo">577</span> List<RegionInfo> stuckAssignments = Lists.newArrayList();<a name="line.577"></a>
-<span class="sourceLineNo">578</span> for (RegionStateNode state:<a name="line.578"></a>
-<span class="sourceLineNo">579</span> masterServices.getAssignmentManager().getRegionStates().getRegionsInTransition()) {<a name="line.579"></a>
-<span class="sourceLineNo">580</span> if (state.isStuck()) {<a name="line.580"></a>
-<span class="sourceLineNo">581</span> stuckAssignments.add(state.getRegionInfo());<a name="line.581"></a>
+<span class="sourceLineNo">469</span> private synchronized void flushConfig()<a name="line.469"></a>
+<span class="sourceLineNo">470</span> throws IOException {<a name="line.470"></a>
+<span class="sourceLineNo">471</span> flushConfig(this.rsGroupMap);<a name="line.471"></a>
+<span class="sourceLineNo">472</span> }<a name="line.472"></a>
+<span class="sourceLineNo">473</span><a name="line.473"></a>
+<span class="sourceLineNo">474</span> private synchronized void flushConfig(Map<String, RSGroupInfo> newGroupMap)<a name="line.474"></a>
+<span class="sourceLineNo">475</span> throws IOException {<a name="line.475"></a>
+<span class="sourceLineNo">476</span> Map<TableName, String> newTableMap;<a name="line.476"></a>
+<span class="sourceLineNo">477</span><a name="line.477"></a>
+<span class="sourceLineNo">478</span> // For offline mode persistence is still unavailable<a name="line.478"></a>
+<span class="sourceLineNo">479</span> // We're refreshing in-memory state but only for default servers<a name="line.479"></a>
+<span class="sourceLineNo">480</span> if (!isOnline()) {<a name="line.480"></a>
+<span class="sourceLineNo">481</span> Map<String, RSGroupInfo> m = Maps.newHashMap(rsGroupMap);<a name="line.481"></a>
+<span class="sourceLineNo">482</span> RSGroupInfo oldDefaultGroup = m.remove(RSGroupInfo.DEFAULT_GROUP);<a name="line.482"></a>
+<span class="sourceLineNo">483</span> RSGroupInfo newDefaultGroup = newGroupMap.remove(RSGroupInfo.DEFAULT_GROUP);<a name="line.483"></a>
+<span class="sourceLineNo">484</span> if (!m.equals(newGroupMap) ||<a name="line.484"></a>
+<span class="sourceLineNo">485</span> !oldDefaultGroup.getTables().equals(newDefaultGroup.getTables())) {<a name="line.485"></a>
+<span class="sourceLineNo">486</span> throw new IOException("Only default servers can be updated during offline mode");<a name="line.486"></a>
+<span class="sourceLineNo">487</span> }<a name="line.487"></a>
+<span class="sourceLineNo">488</span> newGroupMap.put(RSGroupInfo.DEFAULT_GROUP, newDefaultGroup);<a name="line.488"></a>
+<span class="sourceLineNo">489</span> rsGroupMap = newGroupMap;<a name="line.489"></a>
+<span class="sourceLineNo">490</span> return;<a name="line.490"></a>
+<span class="sourceLineNo">491</span> }<a name="line.491"></a>
+<span class="sourceLineNo">492</span><a name="line.492"></a>
+<span class="sourceLineNo">493</span> newTableMap = flushConfigTable(newGroupMap);<a name="line.493"></a>
+<span class="sourceLineNo">494</span><a name="line.494"></a>
+<span class="sourceLineNo">495</span> // Make changes visible after having been persisted to the source of truth<a name="line.495"></a>
+<span class="sourceLineNo">496</span> resetRSGroupAndTableMaps(newGroupMap, newTableMap);<a name="line.496"></a>
+<span class="sourceLineNo">497</span><a name="line.497"></a>
+<span class="sourceLineNo">498</span> try {<a name="line.498"></a>
+<span class="sourceLineNo">499</span> String groupBasePath = ZNodePaths.joinZNode(watcher.znodePaths.baseZNode, rsGroupZNode);<a name="line.499"></a>
+<span class="sourceLineNo">500</span> ZKUtil.createAndFailSilent(watcher, groupBasePath, ProtobufMagic.PB_MAGIC);<a name="line.500"></a>
+<span class="sourceLineNo">501</span><a name="line.501"></a>
+<span class="sourceLineNo">502</span> List<ZKUtil.ZKUtilOp> zkOps = new ArrayList<>(newGroupMap.size());<a name="line.502"></a>
+<span class="sourceLineNo">503</span> for(String groupName : prevRSGroups) {<a name="line.503"></a>
+<span class="sourceLineNo">504</span> if(!newGroupMap.containsKey(groupName)) {<a name="line.504"></a>
+<span class="sourceLineNo">505</span> String znode = ZNodePaths.joinZNode(groupBasePath, groupName);<a name="line.505"></a>
+<span class="sourceLineNo">506</span> zkOps.add(ZKUtil.ZKUtilOp.deleteNodeFailSilent(znode));<a name="line.506"></a>
+<span class="sourceLineNo">507</span> }<a name="line.507"></a>
+<span class="sourceLineNo">508</span> }<a name="line.508"></a>
+<span class="sourceLineNo">509</span><a name="line.509"></a>
+<span class="sourceLineNo">510</span><a name="line.510"></a>
+<span class="sourceLineNo">511</span> for (RSGroupInfo RSGroupInfo : newGroupMap.values()) {<a name="line.511"></a>
+<span class="sourceLineNo">512</span> String znode = ZNodePaths.joinZNode(groupBasePath, RSGroupInfo.getName());<a name="line.512"></a>
+<span class="sourceLineNo">513</span> RSGroupProtos.RSGroupInfo proto = RSGroupProtobufUtil.toProtoGroupInfo(RSGroupInfo);<a name="line.513"></a>
+<span class="sourceLineNo">514</span> LOG.debug("Updating znode: "+znode);<a name="line.514"></a>
+<span class="sourceLineNo">515</span> ZKUtil.createAndFailSilent(watcher, znode);<a name="line.515"></a>
+<span class="sourceLineNo">516</span> zkOps.add(ZKUtil.ZKUtilOp.deleteNodeFailSilent(znode));<a name="line.516"></a>
+<span class="sourceLineNo">517</span> zkOps.add(ZKUtil.ZKUtilOp.createAndFailSilent(znode,<a name="line.517"></a>
+<span class="sourceLineNo">518</span> ProtobufUtil.prependPBMagic(proto.toByteArray())));<a name="line.518"></a>
+<span class="sourceLineNo">519</span> }<a name="line.519"></a>
+<span class="sourceLineNo">520</span> LOG.debug("Writing ZK GroupInfo count: " + zkOps.size());<a name="line.520"></a>
+<span class="sourceLineNo">521</span><a name="line.521"></a>
+<span class="sourceLineNo">522</span> ZKUtil.multiOrSequential(watcher, zkOps, false);<a name="line.522"></a>
+<span class="sourceLineNo">523</span> } catch (KeeperException e) {<a name="line.523"></a>
+<span class="sourceLineNo">524</span> LOG.error("Failed to write to rsGroupZNode", e);<a name="line.524"></a>
+<span class="sourceLineNo">525</span> masterServices.abort("Failed to write to rsGroupZNode", e);<a name="line.525"></a>
+<span class="sourceLineNo">526</span> throw new IOException("Failed to write to rsGroupZNode",e);<a name="line.526"></a>
+<span class="sourceLineNo">527</span> }<a name="line.527"></a>
+<span class="sourceLineNo">528</span> updateCacheOfRSGroups(newGroupMap.keySet());<a name="line.528"></a>
+<span class="sourceLineNo">529</span> }<a name="line.529"></a>
+<span class="sourceLineNo">530</span><a name="line.530"></a>
+<span class="sourceLineNo">531</span> /**<a name="line.531"></a>
+<span class="sourceLineNo">532</span> * Make changes visible.<a name="line.532"></a>
+<span class="sourceLineNo">533</span> * Caller must be synchronized on 'this'.<a name="line.533"></a>
+<span class="sourceLineNo">534</span> */<a name="line.534"></a>
+<span class="sourceLineNo">535</span> private void resetRSGroupAndTableMaps(Map<String, RSGroupInfo> newRSGroupMap,<a name="line.535"></a>
+<span class="sourceLineNo">536</span> Map<TableName, String> newTableMap) {<a name="line.536"></a>
+<span class="sourceLineNo">537</span> // Make maps Immutable.<a name="line.537"></a>
+<span class="sourceLineNo">538</span> this.rsGroupMap = Collections.unmodifiableMap(newRSGroupMap);<a name="line.538"></a>
+<span class="sourceLineNo">539</span> this.tableMap = Collections.unmodifiableMap(newTableMap);<a name="line.539"></a>
+<span class="sourceLineNo">540</span> }<a name="line.540"></a>
+<span class="sourceLineNo">541</span><a name="line.541"></a>
+<span class="sourceLineNo">542</span> /**<a name="line.542"></a>
+<span class="sourceLineNo">543</span> * Update cache of rsgroups.<a name="line.543"></a>
+<span class="sourceLineNo">544</span> * Caller must be synchronized on 'this'.<a name="line.544"></a>
+<span class="sourceLineNo">545</span> * @param currentGroups Current list of Groups.<a name="line.545"></a>
+<span class="sourceLineNo">546</span> */<a name="line.546"></a>
+<span class="sourceLineNo">547</span> private void updateCacheOfRSGroups(final Set<String> currentGroups) {<a name="line.547"></a>
+<span class="sourceLineNo">548</span> this.prevRSGroups.clear();<a name="line.548"></a>
+<span class="sourceLineNo">549</span> this.prevRSGroups.addAll(currentGroups);<a name="line.549"></a>
+<span class="sourceLineNo">550</span> }<a name="line.550"></a>
+<span class="sourceLineNo">551</span><a name="line.551"></a>
+<span class="sourceLineNo">552</span> // Called by getDefaultServers. Presume it has lock in place.<a name="line.552"></a>
+<span class="sourceLineNo">553</span> private List<ServerName> getOnlineRS() throws IOException {<a name="line.553"></a>
+<span class="sourceLineNo">554</span> if (masterServices != null) {<a name="line.554"></a>
+<span class="sourceLineNo">555</span> return masterServices.getServerManager().getOnlineServersList();<a name="line.555"></a>
+<span class="sourceLineNo">556</span> }<a name="line.556"></a>
+<span class="sourceLineNo">557</span> LOG.debug("Reading online RS from zookeeper");<a name="line.557"></a>
+<span class="sourceLineNo">558</span> List<ServerName> servers = new LinkedList<>();<a name="line.558"></a>
+<span class="sourceLineNo">559</span> try {<a name="line.559"></a>
+<span class="sourceLineNo">560</span> for (String el: ZKUtil.listChildrenNoWatch(watcher, watcher.znodePaths.rsZNode)) {<a name="line.560"></a>
+<span class="sourceLineNo">561</span> servers.add(ServerName.parseServerName(el));<a name="line.561"></a>
+<span class="sourceLineNo">562</span> }<a name="line.562"></a>
+<span class="sourceLineNo">563</span> } catch (KeeperException e) {<a name="line.563"></a>
+<span class="sourceLineNo">564</span> throw new IOException("Failed to retrieve server list from zookeeper", e);<a name="line.564"></a>
+<span class="sourceLineNo">565</span> }<a name="line.565"></a>
+<span class="sourceLineNo">566</span> return servers;<a name="line.566"></a>
+<span class="sourceLineNo">567</span> }<a name="line.567"></a>
+<span class="sourceLineNo">568</span><a name="line.568"></a>
+<span class="sourceLineNo">569</span> // Called by ServerEventsListenerThread. Presume it has lock on this manager when it runs.<a name="line.569"></a>
+<span class="sourceLineNo">570</span> private SortedSet<Address> getDefaultServers() throws IOException {<a name="line.570"></a>
+<span class="sourceLineNo">571</span> SortedSet<Address> defaultServers = Sets.newTreeSet();<a name="line.571"></a>
+<span class="sourceLineNo">572</span> for (ServerName serverName : getOnlineRS()) {<a name="line.572"></a>
+<span class="sourceLineNo">573</span> Address server =<a name="line.573"></a>
+<span class="sourceLineNo">574</span> Address.fromParts(serverName.getHostname(), serverName.getPort());<a name="line.574"></a>
+<span class="sourceLineNo">575</span> boolean found = false;<a name="line.575"></a>
+<span class="sourceLineNo">576</span> for(RSGroupInfo rsgi: listRSGroups()) {<a name="line.576"></a>
+<span class="sourceLineNo">577</span> if(!RSGroupInfo.DEFAULT_GROUP.equals(rsgi.getName()) &&<a name="line.577"></a>
+<span class="sourceLineNo">578</span> rsgi.containsServer(server)) {<a name="line.578"></a>
+<span class="sourceLineNo">579</span> found = true;<a name="line.579"></a>
+<span class="sourceLineNo">580</span> break;<a name="line.580"></a>
+<span class="sourceLineNo">581</span> }<a name="line.581"></a>
<span class="sourceLineNo">582</span> }<a name="line.582"></a>
-<span class="sourceLineNo">583</span> }<a name="line.583"></a>
-<span class="sourceLineNo">584</span> for (RegionInfo region: stuckAssignments) {<a name="line.584"></a>
-<span class="sourceLineNo">585</span> LOG.info("Retrying assignment of " + region);<a name="line.585"></a>
-<span class="sourceLineNo">586</span> try {<a name="line.586"></a>
-<span class="sourceLineNo">587</span> masterServices.getAssignmentManager().unassign(region);<a name="line.587"></a>
-<span class="sourceLineNo">588</span> } catch (IOException e) {<a name="line.588"></a>
-<span class="sourceLineNo">589</span> LOG.warn("Unable to reassign " + region, e);<a name="line.589"></a>
-<span class="sourceLineNo">590</span> }<a name="line.590"></a>
-<span class="sourceLineNo">591</span> }<a name="line.591"></a>
-<span class="sourceLineNo">592</span> }<a name="line.592"></a>
-<span class="sourceLineNo">593</span><a name="line.593"></a>
-<span class="sourceLineNo">594</span> /**<a name="line.594"></a>
-<span class="sourceLineNo">595</span> * Calls {@link RSGroupInfoManagerImpl#updateDefaultServers(SortedSet)} to update list of known<a name="line.595"></a>
-<span class="sourceLineNo">596</span> * servers. Notifications about server changes are received by registering {@link ServerListener}.<a name="line.596"></a>
-<span class="sourceLineNo">597</span> * As a listener, we need to return immediately, so the real work of updating the servers is<a name="line.597"></a>
-<span class="sourceLineNo">598</span> * done asynchronously in this thread.<a name="line.598"></a>
-<span class="sourceLineNo">599</span> */<a name="line.599"></a>
-<span class="sourceLineNo">600</span> private class ServerEventsListenerThread extends Thread implements ServerListener {<a name="line.600"></a>
-<span class="sourceLineNo">601</span> private final Log LOG = LogFactory.getLog(ServerEventsListenerThread.class);<a name="line.601"></a>
-<span class="sourceLineNo">602</span> private boolean changed = false;<a name="line.602"></a>
-<span class="sourceLineNo">603</span><a name="line.603"></a>
-<span class="sourceLineNo">604</span> ServerEventsListenerThread() {<a name="line.604"></a>
-<span class="sourceLineNo">605</span> setDaemon(true);<a name="line.605"></a>
-<span class="sourceLineNo">606</span> }<a name="line.606"></a>
-<span class="sourceLineNo">607</span><a name="line.607"></a>
-<span class="sourceLineNo">608</span> @Override<a name="line.608"></a>
-<span class="sourceLineNo">609</span> public void serverAdded(ServerName serverName) {<a name="line.609"></a>
-<span class="sourceLineNo">610</span> serverChanged();<a name="line.610"></a>
-<span class="sourceLineNo">611</span> }<a name="line.611"></a>
-<span class="sourceLineNo">612</span><a name="line.612"></a>
-<span class="sourceLineNo">613</span> @Override<a name="line.613"></a>
-<span class="sourceLineNo">614</span> public void serverRemoved(ServerName serverName) {<a name="line.614"></a>
-<span class="sourceLineNo">615</span> serverChanged();<a name="line.615"></a>
-<span class="sourceLineNo">616</span> }<a name="line.616"></a>
-<span class="sourceLineNo">617</span><a name="line.617"></a>
-<span class="sourceLineNo">618</span> private synchronized void serverChanged() {<a name="line.618"></a>
-<span class="sourceLineNo">619</span> changed = true;<a name="line.619"></a>
-<span class="sourceLineNo">620</span> this.notify();<a name="line.620"></a>
-<span class="sourceLineNo">621</span> }<a name="line.621"></a>
-<span class="sourceLineNo">622</span><a name="line.622"></a>
-<span class="sourceLineNo">623</span> @Override<a name="line.623"></a>
-<span class="sourceLineNo">624</span> public void run() {<a name="line.624"></a>
-<span class="sourceLineNo">625</span> setName(ServerEventsListenerThread.class.getName() + "-" + masterServices.getServerName());<a name="line.625"></a>
-<span class="sourceLineNo">626</span> SortedSet<Address> prevDefaultServers = new TreeSet<>();<a name="line.626"></a>
-<span class="sourceLineNo">627</span> while(isMasterRunning(masterServices)) {<a name="line.627"></a>
-<span class="sourceLineNo">628</span> try {<a name="line.628"></a>
-<span class="sourceLineNo">629</span> LOG.info("Updating default servers.");<a name="line.629"></a>
-<span class="sourceLineNo">630</span> SortedSet<Address> servers = RSGroupInfoManagerImpl.this.getDefaultServers();<a name="line.630"></a>
-<span class="sourceLineNo">631</span> if (!servers.equals(prevDefaultServers)) {<a name="line.631"></a>
-<span class="sourceLineNo">632</span> RSGroupInfoManagerImpl.this.updateDefaultServers(servers);<a name="line.632"></a>
-<span class="sourceLineNo">633</span> prevDefaultServers = servers;<a name="line.633"></a>
-<span class="sourceLineNo">634</span> LOG.info("Updated with servers: "+servers.size());<a name="line.634"></a>
-<span class="sourceLineNo">635</span> }<a name="line.635"></a>
-<span class="sourceLineNo">636</span> try {<a name="line.636"></a>
-<span class="sourceLineNo">637</span> synchronized (this) {<a name="line.637"></a>
-<span class="sourceLineNo">638</span> while (!changed) {<a name="line.638"></a>
-<span class="sourceLineNo">639</span> wait();<a name="line.639"></a>
-<span class="sourceLineNo">640</span> }<a name="line.640"></a>
-<span class="sourceLineNo">641</span> changed = false;<a name="line.641"></a>
-<span class="sourceLineNo">642</span> }<a name="line.642"></a>
-<span class="sourceLineNo">643</span> } catch (InterruptedException e) {<a name="line.643"></a>
-<span class="sourceLineNo">644</span> LOG.warn("Interrupted", e);<a name="line.644"></a>
-<span class="sourceLineNo">645</span> }<a name="line.645"></a>
-<span class="sourceLineNo">646</span> } catch (IOException e) {<a name="line.646"></a>
-<span class="sourceLineNo">647</span> LOG.warn("Failed to update default servers", e);<a name="line.647"></a>
-<span class="sourceLineNo">648</span> }<a name="line.648"></a>
-<span class="sourceLineNo">649</span> }<a name="line.649"></a>
-<span class="sourceLineNo">650</span> }<a name="line.650"></a>
-<span class="sourceLineNo">651</span> }<a name="line.651"></a>
-<span class="sourceLineNo">652</span><a name="line.652"></a>
-<span class="sourceLineNo">653</span> private class FailedOpenUpdaterThread extends Thread implements ServerListener {<a name="line.653"></a>
-<span class="sourceLineNo">654</span> private final long waitInterval;<a name="line.654"></a>
-<span class="sourceLineNo">655</span> private volatile boolean hasChanged = false;<a name="line.655"></a>
-<span class="sourceLineNo">656</span><a name="line.656"></a>
-<span class="sourceLineNo">657</span> public FailedOpenUpdaterThread(Configuration conf) {<a name="line.657"></a>
-<span class="sourceLineNo">658</span> this.waitInterval = conf.getLong(REASSIGN_WAIT_INTERVAL_KEY,<a name="line.658"></a>
-<span class="sourceLineNo">659</span> DEFAULT_REASSIGN_WAIT_INTERVAL);<a name="line.659"></a>
-<span class="sourceLineNo">660</span> setDaemon(true);<a name="line.660"></a>
-<span class="sourceLineNo">661</span> }<a name="line.661"></a>
-<span class="sourceLineNo">662</span><a name="line.662"></a>
-<span class="sourceLineNo">663</span> @Override<a name="line.663"></a>
-<span class="sourceLineNo">664</span> public void serverAdded(ServerName serverName) {<a name="line.664"></a>
-<span class="sourceLineNo">665</span> serverChanged();<a name="line.665"></a>
-<span class="sourceLineNo">666</span> }<a name="line.666"></a>
-<span class="sourceLineNo">667</span><a name="line.667"></a>
-<span class="sourceLineNo">668</span> @Override<a name="line.668"></a>
-<span class="sourceLineNo">669</span> public void serverRemoved(ServerName serverName) {<a name="line.669"></a>
-<span class="sourceLineNo">670</span> }<a name="line.670"></a>
-<span class="sourceLineNo">671</span><a name="line.671"></a>
-<span class="sourceLineNo">672</span> @Override<a name="line.672"></a>
-<span class="sourceLineNo">673</span> public void run() {<a name="line.673"></a>
-<span class="sourceLineNo">674</span> while (isMasterRunning(masterServices)) {<a name="line.674"></a>
-<span class="sourceLineNo">675</span> boolean interrupted = false;<a name="line.675"></a>
-<span class="sourceLineNo">676</span> try {<a name="line.676"></a>
-<span class="sourceLineNo">677</span> synchronized (this) {<a name="line.677"></a>
-<span class="sourceLineNo">678</span> while (!hasChanged) {<a name="line.678"></a>
-<span class="sourceLineNo">679</span> wait();<a name="line.679"></a>
-<span class="sourceLineNo">680</span> }<a name="line.680"></a>
-<span class="sourceLineNo">681</span> hasChanged = false;<a name="line.681"></a>
-<span class="sourceLineNo">682</span> }<a name="line.682"></a>
-<span class="sourceLineNo">683</span> } catch (InterruptedException e) {<a name="line.683"></a>
-<span class="sourceLineNo">684</span> LOG.warn("Interrupted", e);<a name="line.684"></a>
-<span class="sourceLineNo">685</span> interrupted = true;<a name="line.685"></a>
-<span class="sourceLineNo">686</span> }<a name="line.686"></a>
-<span class="sourceLineNo">687</span> if (!isMasterRunning(masterServices) || interrupted) {<a name="line.687"></a>
-<span class="sourceLineNo">688</span> continue;<a name="line.688"></a>
-<span class="sourceLineNo">689</span> }<a name="line.689"></a>
-<span class="sourceLineNo">690</span><a name="line.690"></a>
-<span class="sourceLineNo">691</span> // First, wait a while in case more servers are about to rejoin the cluster<a name="line.691"></a>
-<span class="sourceLineNo">692</span> try {<a name="line.692"></a>
-<span class="sourceLineNo">693</span> Thread.sleep(waitInterval);<a name="line.693"></a>
-<span class="sourceLineNo">694</span> } catch (InterruptedException e) {<a name="line.694"></a>
-<span class="sourceLineNo">695</span> LOG.warn("Interrupted", e);<a name="line.695"></a>
-<span class="sourceLineNo">696</span> }<a name="line.696"></a>
-<span class="sourceLineNo">697</span> if (!isMasterRunning(masterServices)) {<a name="line.697"></a>
-<span class="sourceLineNo">698</span> continue;<a name="line.698"></a>
-<span class="sourceLineNo">699</span> }<a name="line.699"></a>
-<span class="sourceLineNo">700</span><a name="line.700"></a>
-<span class="sourceLineNo">701</span> // Kick all regions in FAILED_OPEN state<a name="line.701"></a>
-<span class="sourceLineNo">702</span> updateFailedAssignments();<a name="line.702"></a>
-<span class="sourceLineNo">703</span> }<a name="line.703"></a>
-<span class="sourceLineNo">704</span> }<a name="line.704"></a>
-<span class="sourceLineNo">705</span><a name="line.705"></a>
-<span class="sourceLineNo">706</span> public void serverChanged() {<a name="line.706"></a>
-<span class="sourceLineNo">707</span> synchronized (this) {<a name="line.707"></a>
-<span class="sourceLineNo">708</span> hasChanged = true;<a name="line.708"></a>
-<span class="sourceLineNo">709</span> this.notify();<a name="line.709"></a>
-<span class="sourceLineNo">710</span> }<a name="line.710"></a>
-<span class="sourceLineNo">711</span> }<a name="line.711"></a>
-<span class="sourceLineNo">712</span> }<a name="line.712"></a>
-<span class="sourceLineNo">713</span><a name="line.713"></a>
-<span class="sourceLineNo">714</span> private class RSGroupStartupWorker extends Thread {<a name="line.714"></a>
-<span class="sourceLineNo">715</span> private final Log LOG = LogFactory.getLog(RSGroupStartupWorker.class);<a name="line.715"></a>
-<span class="sourceLineNo">716</span> private volatile boolean online = false;<a name="line.716"></a>
-<span class="sourceLineNo">717</span><a name="line.717"></a>
-<span class="sourceLineNo">718</span> RSGroupStartupWorker() {<a name="line.718"></a>
-<span class="sourceLineNo">719</span> setDaemon(true);<a name="line.719"></a>
-<span class="sourceLineNo">720</span> }<a name="line.720"></a>
-<span class="sourceLineNo">721</span><a name="line.721"></a>
-<span class="sourceLineNo">722</span> @Override<a name="line.722"></a>
-<span class="sourceLineNo">723</span> public void run() {<a name="line.723"></a>
-<span class="sourceLineNo">724</span> setName(RSGroupStartupWorker.class.getName() + "-" + masterServices.getServerName());<a name="line.724"></a>
-<span class="sourceLineNo">725</span> if (waitForGroupTableOnline()) {<a name="line.725"></a>
-<span class="sourceLineNo">726</span> LOG.info("GroupBasedLoadBalancer is now online");<a name="line.726"></a>
-<span class="sourceLineNo">727</span> }<a name="line.727"></a>
-<span class="sourceLineNo">728</span> }<a name="line.728"></a>
-<span class="sourceLineNo">729</span><a name="line.729"></a>
-<span class="sourceLineNo">730</span> private boolean waitForGroupTableOnline() {<a name="line.730"></a>
-<span class="sourceLineNo">731</span> final List<RegionInfo> foundRegions = new LinkedList<>();<a name="line.731"></a>
-<span class="sourceLineNo">732</span> final List<RegionInfo> assignedRegions = new LinkedList<>();<a name="line.732"></a>
-<span class="sourceLineNo">733</span> final AtomicBoolean found = new AtomicBoolean(false);<a name="line.733"></a>
-<span class="sourceLineNo">734</span> final TableStateManager tsm = masterServices.getTableStateManager();<a name="line.734"></a>
-<span class="sourceLineNo">735</span> boolean createSent = false;<a name="line.735"></a>
-<span class="sourceLineNo">736</span> while (!found.get() && isMasterRunning(masterServices)) {<a name="line.736"></a>
-<span class="sourceLineNo">737</span> foundRegions.clear();<a name="line.737"></a>
-<span class="sourceLineNo">738</span> assignedRegions.clear();<a name="line.738"></a>
-<span class="sourceLineNo">739</span> found.set(true);<a name="line.739"></a>
-<span class="sourceLineNo">740</span> try {<a name="line.740"></a>
-<span class="sourceLineNo">741</span> conn.getTable(TableName.NAMESPACE_TABLE_NAME);<a name="line.741"></a>
-<span class="sourceLineNo">742</span> conn.getTable(RSGROUP_TABLE_NAME);<a name="line.742"></a>
-<span class="sourceLineNo">743</span> boolean rootMetaFound =<a name="line.743"></a>
-<span class="sourceLineNo">744</span> masterServices.getMetaTableLocator().verifyMetaRegionLocation(<a name="line.744"></a>
-<span class="sourceLineNo">745</span> conn, masterServices.getZooKeeper(), 1);<a name="line.745"></a>
-<span class="sourceLineNo">746</span> final AtomicBoolean nsFound = new AtomicBoolean(false);<a name="line.746"></a>
-<span class="sourceLineNo">747</span> if (rootMetaFound) {<a name="line.747"></a>
-<span class="sourceLineNo">748</span> MetaTableAccessor.Visitor visitor = new DefaultVisitorBase() {<a name="line.748"></a>
-<span class="sourceLineNo">749</span> @Override<a name="line.749"></a>
-<span class="sourceLineNo">750</span> public boolean visitInternal(Result row) throws IOException {<a name="line.750"></a>
-<span class="sourceLineNo">751</span> RegionInfo info = MetaTableAccessor.getRegionInfo(row);<a name="line.751"></a>
-<span class="sourceLineNo">752</span> if (info != null) {<a name="line.752"></a>
-<span class="sourceLineNo">753</span> Cell serverCell =<a name="line.753"></a>
-<span class="sourceLineNo">754</span> row.getColumnLatestCell(HConstants.CATALOG_FAMILY,<a name="line.754"></a>
-<span class="sourceLineNo">755</span> HConstants.SERVER_QUALIFIER);<a name="line.755"></a>
-<span class="sourceLineNo">756</span> if (RSGROUP_TABLE_NAME.equals(info.getTable()) && serverCell != null) {<a name="line.756"></a>
-<span class="sourceLineNo">757</span> ServerName sn =<a name="line.757"></a>
-<span class="sourceLineNo">758</span> ServerName.parseVersionedServerName(CellUtil.cloneValue(serverCell));<a name="line.758"></a>
-<span class="sourceLineNo">759</span> if (sn == null) {<a name="line.759"></a>
-<span class="sourceLineNo">760</span> found.set(false);<a name="line.760"></a>
-<span class="sourceLineNo">761</span> } else if (tsm.isTableState(RSGROUP_TABLE_NAME, TableState.State.ENABLED)) {<a name="line.761"></a>
-<span class="sourceLineNo">762</span> try {<a name="line.762"></a>
-<span class="sourceLineNo">763</span> ClientProtos.ClientService.BlockingInterface rs = conn.getClient(sn);<a name="line.763"></a>
-<span class="sourceLineNo">764</span> ClientProtos.GetRequest request =<a name="line.764"></a>
-<span class="sourceLineNo">765</span> RequestConverter.buildGetRequest(info.getRegionName(),<a name="line.765"></a>
-<span class="sourceLineNo">766</span> new Get(ROW_KEY));<a name="line.766"></a>
-<span class="sourceLineNo">767</span> rs.get(null, request);<a name="line.767"></a>
-<span class="sourceLineNo">768</span> assignedRegions.add(info);<a name="line.768"></a>
-<span class="sourceLineNo">769</span> } catch(Exception ex) {<a name="line.769"></a>
-<span class="sourceLineNo">770</span> LOG.debug("Caught exception while verifying group region", ex);<a name="line.770"></a>
-<span class="sourceLineNo">771</span> }<a name="line.771"></a>
-<span class="sourceLineNo">772</span> }<a name="line.772"></a>
-<span class="sourceLineNo">773</span> foundRegions.add(info);<a name="line.773"></a>
-<span class="sourceLineNo">774</span> }<a name="line.774"></a>
-<span class="sourceLineNo">775</span> if (TableName.NAMESPACE_TABLE_NAME.equals(info.getTable())) {<a name="line.775"></a>
-<span class="sourceLineNo">776</span> Cell cell = row.getColumnLatestCell(HConstants.CATALOG_FAMILY,<a name="line.776"></a>
-<span class="sourceLineNo">777</span> HConstants.SERVER_QUALIFIER);<a name="line.777"></a>
-<span class="sourceLineNo">778</span> ServerName sn = null;<a name="line.778"></a>
-<span class="sourceLineNo">779</span> if(cell != null) {<a name="line.779"></a>
-<span class="sourceLineNo">780</span> sn = ServerName.parseVersionedServerName(CellUtil.cloneValue(cell));<a name="line.780"></a>
-<span class="sourceLineNo">781</span> }<a name="line.781"></a>
-<span class="sourceLineNo">782</span> if (sn == null) {<a name="line.782"></a>
-<span class="sourceLineNo">783</span> nsFound.set(false);<a name="line.783"></a>
-<span class="sourceLineNo">784</span> } else if (tsm.isTableState(TableName.NAMESPACE_TABLE_NAME,<a name="line.784"></a>
-<span class="sourceLineNo">785</span> TableState.State.ENABLED)) {<a name="line.785"></a>
-<span class="sourceLineNo">786</span> try {<a name="line.786"></a>
-<span class="sourceLineNo">787</span> ClientProtos.ClientService.BlockingInterface rs = conn.getClient(sn);<a name="line.787"></a>
-<span class="sourceLineNo">788</span> ClientProtos.GetRequest request =<a name="line.788"></a>
-<span class="sourceLineNo">789</span> RequestConverter.buildGetRequest(info.getRegionName(),<a name="line.789"></a>
-<span class="sourceLineNo">790</span> new Get(ROW_KEY));<a name="line.790"></a>
-<span class="sourceLineNo">791</span> rs.get(null, request);<a name="line.791"></a>
-<span class="sourceLineNo">792</span> nsFound.set(true);<a name="line.792"></a>
-<span class="sourceLineNo">793</span> } catch(Exception ex) {<a name="line.793"></a>
-<span class="sourceLineNo">794</span> LOG.debug("Caught exception while verifying group region", ex);<a name="line.794"></a>
-<span class="sourceLineNo">795</span> }<a name="line.795"></a>
-<span class="sourceLineNo">796</span> }<a name="line.796"></a>
-<span class="sourceLineNo">797</span> }<a name="line.797"></a>
-<span class="sourceLineNo">798</span> }<a name="line.798"></a>
-<span class="sourceLineNo">799</span> return true;<a name="line.799"></a>
-<span class="sourceLineNo">800</span> }<a name="line.800"></a>
-<span class="sourceLineNo">801</span> };<a name="line.801"></a>
-<span class="sourceLineNo">802</span> MetaTableAccessor.fullScanRegions(conn, visitor);<a name="line.802"></a>
-<span class="sourceLineNo">803</span> // if no regions in meta then we have to create the table<a name="line.803"></a>
-<span class="sourceLineNo">804</span> if (foundRegions.size() < 1 && rootMetaFound && !createSent && nsFound.get()) {<a name="line.804"></a>
-<span class="sourceLineNo">805</span> createRSGroupTable();<a name="line.805"></a>
-<span class="sourceLineNo">806</span> createSent = true;<a name="line.806"></a>
-<span class="sourceLineNo">807</span> }<a name="line.807"></a>
-<span class="sourceLineNo">808</span> LOG.info("RSGroup table=" + RSGROUP_TABLE_NAME + " isOnline=" + found.get()<a name="line.808"></a>
-<span class="sourceLineNo">809</span> + ", regionCount=" + foundRegions.size() + ", assignCount="<a name="line.809"></a>
-<span class="sourceLineNo">810</span> + assignedRegions.size() + ", rootMetaFound=" + rootMetaFound);<a name="line.810"></a>
-<span class="sourceLineNo">811</span> found.set(found.get() && assignedRegions.size() == foundRegions.size()<a name="line.811"></a>
-<span class="sourceLineNo">812</span> && foundRegions.size() > 0);<a name="line.812"></a>
-<span class="sourceLineNo">813</span> } else {<a name="line.813"></a>
-<span class="sourceLineNo">814</span> LOG.info("Waiting for catalog tables to come online");<a name="line.814"></a>
-<span class="sourceLineNo">815</span> found.set(false);<a name="line.815"></a>
-<span class="sourceLineNo">816</span> }<a name="line.816"></a>
-<span class="sourceLineNo">817</span> if (found.get()) {<a name="line.817"></a>
-<span class="sourceLineNo">818</span> LOG.debug("With group table online, refreshing cached information.");<a name="line.818"></a>
-<span class="sourceLineNo">819</span> RSGroupInfoManagerImpl.this.refresh(true);<a name="line.819"></a>
-<span class="sourceLineNo">820</span> online = true;<a name="line.820"></a>
-<span class="sourceLineNo">821</span> //flush any inconsistencies between ZK and HTable<a name="line.821"></a>
-<span class="sourceLineNo">822</span> RSGroupInfoManagerImpl.this.flushConfig();<a name="line.822"></a>
-<span class="sourceLineNo">823</span> }<a name="line.823"></a>
-<span class="sourceLineNo">824</span> } catch (RuntimeException e) {<a name="line.824"></a>
-<span class="sourceLineNo">825</span> throw e;<a name="line.825"></a>
-<span class="sourceLineNo">826</span> } catch(Exception e) {<a name="line.826"></a>
-<span class="sourceLineNo">827</span> found.set(false);<a name="line.827"></a>
-<span class="sourceLineNo">828</span> LOG.warn("Failed to perform check", e);<a name="line.828"></a>
-<span class="sourceLineNo">829</span> }<a name="line.829"></a>
-<span class="sourceLineNo">830</span> try {<a name="line.830"></a>
-<span class="sourceLineNo">831</span> Thread.sleep(100);<a name="line.831"></a>
-<span class="sourceLineNo">832</span> } catch (InterruptedException e) {<a name="line.832"></a>
-<span class="sourceLineNo">833</span> LOG.info("Sleep interrupted", e);<a name="line.833"></a>
-<span class="sourceLineNo">834</span> }<a name="line.834"></a>
-<span class="sourceLineNo">835</span> }<a name="line.835"></a>
-<span class="sourceLineNo">836</span> return found.get();<a name="line.836"></a>
-<span class="sourceLineNo">837</span> }<a name="line.837"></a>
-<span class="sourceLineNo">838</span><a name="line.838"></a>
-<span class="sourceLineNo">839</span> private void createRSGroupTable() throws IOException {<a name="line.839"></a>
-<span class="sourceLineNo">840</span> Long procId = masterServices.createSystemTable(RSGROUP_TABLE_DESC);<a name="line.840"></a>
-<span class="sourceLineNo">841</span> // wait for region to be online<a name="line.841"></a>
-<span class="sourceLineNo">842</span> int tries = 600;<a name="line.842"></a>
-<span class="sourceLineNo">843</span> while (!(masterServices.getMasterProcedureExecutor().isFinished(procId))<a name="line.843"></a>
-<span class="sourceLineNo">844</span> && masterServices.getMasterProcedureExecutor().isRunning()<a name="line.844"></a>
-<span class="sourceLineNo">845</span> && tries > 0) {<a name="line.845"></a>
-<span class="sourceLineNo">846</span> try {<a name="line.846"></a>
-<span class="sourceLineNo">847</span> Thread.sleep(100);<a name="line.847"></a>
-<span class="sourceLineNo">848</span> } catch (InterruptedException e) {<a name="line.848"></a>
-<span class="sourceLineNo">849</span> throw new IOException("Wait interrupted ", e);<a name="line.849"></a>
-<span class="sourceLineNo">850</span> }<a name="line.850"></a>
-<span class="sourceLineNo">851</span> tries--;<a name="line.851"></a>
-<span class="sourceLineNo">852</span> }<a name="line.852"></a>
-<span class="sourceLineNo">853</span> if(tries <= 0) {<a name="line.853"></a>
-<span class="sourceLineNo">854</span> throw new IOException("Failed to create group table in a given time.");<a name="line.854"></a>
-<span class="sourceLineNo">855</span> } else {<a name="line.855"></a>
-<span class="sourceLineNo">856</span> Procedure<?> result = masterServices.getMasterProcedureExecutor().getResult(procId);<a name="line.856"></a>
-<span class="sourceLineNo">857</span> if (result != null && result.isFailed()) {<a name="line.857"></a>
-<span class="sourceLineNo">858</span> throw new IOException("Failed to create group table. " +<a name="line.858"></a>
-<span class="sourceLineNo">859</span> result.getException().unwrapRemoteIOException());<a name="line.859"></a>
+<span class="sourceLineNo">583</span> if (!found) {<a name="line.583"></a>
+<span class="sourceLineNo">584</span> defaultServers.add(server);<a name="line.584"></a>
+<span class="sourceLineNo">585</span> }<a name="line.585"></a>
+<span class="sourceLineNo">586</span> }<a name="line.586"></a>
+<span class="sourceLineNo">587</span> return defaultServers;<a name="line.587"></a>
+<span class="sourceLineNo">588</span> }<a name="line.588"></a>
+<span class="sourceLineNo">589</span><a name="line.589"></a>
+<span class="sourceLineNo">590</span> // Called by ServerEventsListenerThread. Synchronize on this because redoing<a name="line.590"></a>
+<span class="sourceLineNo">591</span> // the rsGroupMap then writing it out.<a name="line.591"></a>
+<span class="sourceLineNo">592</span> private synchronized void updateDefaultServers(SortedSet<Address> servers) throws IOException {<a name="line.592"></a>
+<span class="sourceLineNo">593</span> RSGroupInfo info = rsGroupMap.get(RSGroupInfo.DEFAULT_GROUP);<a name="line.593"></a>
+<span class="sourceLineNo">594</span> RSGroupInfo newInfo = new RSGroupInfo(info.getName(), servers, info.getTables());<a name="line.594"></a>
+<span class="sourceLineNo">595</span> HashMap<String, RSGroupInfo> newGroupMap = Maps.newHashMap(rsGroupMap);<a name="line.595"></a>
+<span class="sourceLineNo">596</span> newGroupMap.put(newInfo.getName(), newInfo);<a name="line.596"></a>
+<span class="sourceLineNo">597</span> flushConfig(newGroupMap);<a name="line.597"></a>
+<span class="sourceLineNo">598</span> }<a name="line.598"></a>
+<span class="sourceLineNo">599</span><a name="line.599"></a>
+<span class="sourceLineNo">600</span> // Called by FailedOpenUpdaterThread<a name="line.600"></a>
+<span class="sourceLineNo">601</span> private void updateFailedAssignments() {<a name="line.601"></a>
+<span class="sourceLineNo">602</span> // Kick all regions in FAILED_OPEN state<a name="line.602"></a>
+<span class="sourceLineNo">603</span> List<RegionInfo> stuckAssignments = Lists.newArrayList();<a name="line.603"></a>
+<span class="sourceLineNo">604</span> for (RegionStateNode state:<a name="line.604"></a>
+<span class="sourceLineNo">605</span> masterServices.getAssignmentManager().getRegionStates().getRegionsInTransition()) {<a name="line.605"></a>
+<span class="sourceLineNo">606</span> if (state.isStuck()) {<a name="line.606"></a>
+<span class="sourceLineNo">607</span> stuckAssignments.add(state.getRegionInfo());<a name="line.607"></a>
+<span class="sourceLineNo">608</span> }<a name="line.608"></a>
+<span class="sourceLineNo">609</span> }<a name="line.609"></a>
+<span class="sourceLineNo">610</span> for (RegionInfo region: stuckAssignments) {<a name="line.610"></a>
+<span class="sourceLineNo">611</span> LOG.info("Retrying assignment of " + region);<a name="line.611"></a>
+<span class="sourceLineNo">612</span> try {<a name="line.612"></a>
+<span class="sourceLineNo">613</span> masterServices.getAssignmentManager().unassign(region);<a name="line.613"></a>
+<span class="sourceLineNo">614</span> } catch (IOException e) {<a name="line.614"></a>
+<span class="sourceLineNo">615</span> LOG.warn("Unable to reassign " + region, e);<a name="line.615"></a>
+<span class="sourceLineNo">616</span> }<a name="line.616"></a>
+<span class="sourceLineNo">617</span> }<a name="line.617"></a>
+<span class="sourceLineNo">618</span> }<a name="line.618"></a>
+<span class="sourceLineNo">619</span><a name="line.619"></a>
+<span class="sourceLineNo">620</span> /**<a name="line.620"></a>
+<span class="sourceLineNo">621</span> * Calls {@link RSGroupInfoManagerImpl#updateDefaultServers(SortedSet)} to update list of known<a name="line.621"></a>
+<span class="sourceLineNo">622</span> * servers. Notifications about server changes are received by registering {@link ServerListener}.<a name="line.622"></a>
+<span class="sourceLineNo">623</span> * As a listener, we need to return immediately, so the real work of updating the servers is<a name="line.623"></a>
+<span class="sourceLineNo">624</span> * done asynchronously in this thread.<a name="line.624"></a>
+<span class="sourceLineNo">625</span> */<a name="line.625"></a>
+<span class="sourceLineNo">626</span> private class ServerEventsListenerThread extends Thread implements ServerListener {<a name="line.626"></a>
+<span class="sourceLineNo">627</span> private final Log LOG = LogFactory.getLog(ServerEventsListenerThread.class);<a name="line.627"></a>
+<span class="sourceLineNo">628</span> private boolean changed = false;<a name="line.628"></a>
+<span class="sourceLineNo">629</span><a name="line.629"></a>
+<span class="sourceLineNo">630</span> ServerEventsListenerThread() {<a name="line.630"></a>
+<span class="sourceLineNo">631</span> setDaemon(true);<a name="line.631"></a>
+<span class="sourceLineNo">632</span> }<a name="line.632"></a>
+<span class="sourceLineNo">633</span><a name="line.633"></a>
+<span class="sourceLineNo">634</span> @Override<a name="line.634"></a>
+<span class="sourceLineNo">635</span> public void serverAdded(ServerName serverName) {<a name="line.635"></a>
+<span class="sourceLineNo">636</span> serverChanged();<a name="line.636"></a>
+<span class="sourceLineNo">637</span> }<a name="line.637"></a>
+<span class="sourceLineNo">638</span><a name="line.638"></a>
+<span class="sourceLineNo">639</span> @Override<a name="line.639"></a>
+<span class="sourceLineNo">640</span> public void serverRemoved(ServerName serverName) {<a name="line.640"></a>
+<span class="sourceLineNo">641</span> serverChanged();<a name="line.641"></a>
+<span class="sourceLineNo">642</span> }<a name="line.642"></a>
+<span class="sourceLineNo">643</span><a name="line.643"></a>
+<span class="sourceLineNo">644</span> private synchronized void serverChanged() {<a name="line.644"></a>
+<span class="sourceLineNo">645</span> changed = true;<a name="line.645"></a>
+<span class="sourceLineNo">646</span> this.notify();<a name="line.646"></a>
+<span class="sourceLineNo">647</span> }<a name="line.647"></a>
+<span class="sourceLineNo">648</span><a name="line.648"></a>
+<span class="sourceLineNo">649</span> @Override<a name="line.649"></a>
+<span class="sourceLineNo">650</span> public void run() {<a name="line.650"></a>
+<span class="sourceLineNo">651</span> setName(ServerEventsListenerThread.class.getName() + "-" + masterServices.getServerName());<a name="line.651"></a>
+<span class="sourceLineNo">652</span> SortedSet<Address> prevDefaultServers = new TreeSet<>();<a name="line.652"></a>
+<span class="sourceLineNo">653</span> while(isMasterRunning(masterServices)) {<a name="line.653"></a>
+<span class="sourceLineNo">654</span> try {<a name="line.654"></a>
+<span class="sourceLineNo">655</span> LOG.info("Updati
<TRUNCATED>