HBASE-19757 System table gets stuck after enabling region server group feature in secure cluster
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/fd435070 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/fd435070 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/fd435070 Branch: refs/heads/HBASE-19064 Commit: fd43507069e3ae8d9cb689e69e3b5e211cf36e99 Parents: 8b520ce Author: tedyu <yuzhih...@gmail.com> Authored: Thu Jan 18 17:56:07 2018 -0800 Committer: tedyu <yuzhih...@gmail.com> Committed: Thu Jan 18 17:56:07 2018 -0800 ---------------------------------------------------------------------- .../hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/fd435070/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.java ---------------------------------------------------------------------- diff --git a/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.java b/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.java index 9ba1218..956f8ba 100644 --- a/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.java +++ b/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.java @@ -400,14 +400,8 @@ final class RSGroupInfoManagerImpl implements RSGroupInfoManager { orphanTables.add(TableName.valueOf(entry)); } - final List<TableName> specialTables; - if(!masterServices.isInitialized()) { - specialTables = Arrays.asList(AccessControlLists.ACL_TABLE_NAME, TableName.META_TABLE_NAME, - TableName.NAMESPACE_TABLE_NAME, RSGROUP_TABLE_NAME); - } else { - specialTables = - masterServices.listTableNamesByNamespace(NamespaceDescriptor.SYSTEM_NAMESPACE_NAME_STR); - } + final List<TableName> specialTables = Arrays.asList(AccessControlLists.ACL_TABLE_NAME, + TableName.META_TABLE_NAME, TableName.NAMESPACE_TABLE_NAME, RSGROUP_TABLE_NAME); for (TableName table : specialTables) { orphanTables.add(table);
