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

HBASE-21987 Simplify RSGroupInfoManagerImpl#flushConfig() for offline mode 

Signed-off-by: Xu Cang <xucang@apache.org>
This commit is contained in:
Xiang Li 2019-03-05 08:00:38 +00:00 committed by Xu Cang
parent cce40e14bc
commit 0bfaccaf21
No known key found for this signature in database
GPG Key ID: 8E6C8FEDCA866394
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -490,20 +490,37 @@ final class RSGroupInfoManagerImpl implements RSGroupInfoManager {
Map<TableName, String> newTableMap; Map<TableName, String> newTableMap;
// For offline mode persistence is still unavailable // For offline mode persistence is still unavailable
// We're refreshing in-memory state but only for default servers // We're refreshing in-memory state but only for servers in default group
if (!isOnline()) { if (!isOnline()) {
Map<String, RSGroupInfo> m = Maps.newHashMap(rsGroupMap); if (newGroupMap == this.rsGroupMap) {
RSGroupInfo oldDefaultGroup = m.remove(RSGroupInfo.DEFAULT_GROUP); // When newGroupMap is this.rsGroupMap itself,
RSGroupInfo newDefaultGroup = newGroupMap.remove(RSGroupInfo.DEFAULT_GROUP); // do not need to check default group and other groups as followed
if (!m.equals(newGroupMap) ||
!oldDefaultGroup.getTables().equals(newDefaultGroup.getTables())) {
throw new IOException("Only default servers can be updated during offline mode");
}
newGroupMap.put(RSGroupInfo.DEFAULT_GROUP, newDefaultGroup);
rsGroupMap = newGroupMap;
return; return;
} }
Map<String, RSGroupInfo> oldGroupMap = Maps.newHashMap(rsGroupMap);
RSGroupInfo oldDefaultGroup = oldGroupMap.remove(RSGroupInfo.DEFAULT_GROUP);
RSGroupInfo newDefaultGroup = newGroupMap.remove(RSGroupInfo.DEFAULT_GROUP);
if (!oldGroupMap.equals(newGroupMap) /* compare both tables and servers in other groups */ ||
!oldDefaultGroup.getTables().equals(newDefaultGroup.getTables())
/* compare tables in default group */) {
throw new IOException("Only servers in default group can be updated during offline mode");
}
// Restore newGroupMap by putting its default group back
newGroupMap.put(RSGroupInfo.DEFAULT_GROUP, newDefaultGroup);
// Refresh rsGroupMap
// according to the inputted newGroupMap (an updated copy of rsGroupMap)
rsGroupMap = newGroupMap;
// Do not need to update tableMap
// because only the update on servers in default group is allowed above,
// or IOException will be thrown
return;
}
/* For online mode, persist to Zookeeper */
newTableMap = flushConfigTable(newGroupMap); newTableMap = flushConfigTable(newGroupMap);
// Make changes visible after having been persisted to the source of truth // Make changes visible after having been persisted to the source of truth