From 3601bd29582cdfe0fae00f11d882665c40ee4773 Mon Sep 17 00:00:00 2001 From: Andrew Purtell Date: Tue, 23 Jan 2018 18:37:33 -0800 Subject: [PATCH] HBASE-19757 System table gets stuck after enabling region server group feature in secure cluster HBASE-19757 System table gets stuck after enabling region server group feature in secure cluster - addendum removes unused import Amending-Author: Andrew Purtell --- .../hbase/rsgroup/RSGroupInfoManagerImpl.java | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) 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 350d8505045..e4401c0c245 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 @@ -27,6 +27,7 @@ import com.google.common.collect.Sets; import com.google.protobuf.ServiceException; import java.io.IOException; +import java.util.Arrays; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; @@ -51,7 +52,6 @@ import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.MetaTableAccessor; -import org.apache.hadoop.hbase.NamespaceDescriptor; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.TableStateManager; @@ -313,17 +313,8 @@ public class RSGroupInfoManagerImpl implements RSGroupInfoManager, ServerListene orphanTables.add(TableName.valueOf(entry)); } - List specialTables; - if(!master.isInitialized()) { - specialTables = new ArrayList(); - specialTables.add(AccessControlLists.ACL_TABLE_NAME); - specialTables.add(TableName.META_TABLE_NAME); - specialTables.add(TableName.NAMESPACE_TABLE_NAME); - specialTables.add(RSGROUP_TABLE_NAME); - } else { - specialTables = - master.listTableNamesByNamespace(NamespaceDescriptor.SYSTEM_NAMESPACE_NAME_STR); - } + final List 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);