Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "HBASE-22009 Improve RSGroupInfoManagerImpl#getDefaultServers()" 

This reverts commit 73f138c302.
This commit is contained in:
Xu Cang 2019-03-19 15:32:28 -07:00
parent ee31b6a80b
commit 530bd6f570
No known key found for this signature in database
GPG Key ID: 8E6C8FEDCA866394
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.java
View File

@ -479,18 +479,18 @@ public class RSGroupInfoManagerImpl implements RSGroupInfoManager, ServerListene
}
private List<Address> getDefaultServers() throws IOException {
// Build a list of servers in other groups than default group, from rsGroupMap
Set<Address> serversInOtherGroup = new HashSet<>();
for (RSGroupInfo group : listRSGroups() /* get from rsGroupMap */) {
if (!RSGroupInfo.DEFAULT_GROUP.equals(group.getName())) { // not default group
serversInOtherGroup.addAll(group.getServers());
}
}
// Get all online servers from Zookeeper and find out servers in default group
List<Address> defaultServers = new LinkedList<Address>();
for(ServerName server : getOnlineRS()) {
Address address = Address.fromParts(server.getHostname(), server.getPort());
if (!serversInOtherGroup.contains(server)) { // not in other groups
boolean found = false;
for(RSGroupInfo info : rsGroupMap.values()) {
if(!RSGroupInfo.DEFAULT_GROUP.equals(info.getName()) &&
info.containsServer(address)) {
found = true;
break;
}
}
if(!found) {
defaultServers.add(address);
}
}