You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2018/01/24 02:46:00 UTC
[1/2] hbase git commit: HBASE-19757 System table gets stuck after
enabling region server group feature in secure cluster
Repository: hbase
Updated Branches:
refs/heads/branch-1 73ed12703 -> 3601bd295
refs/heads/branch-1.4 a75533ba5 -> 636376b28
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 <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/3601bd29
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/3601bd29
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/3601bd29
Branch: refs/heads/branch-1
Commit: 3601bd29582cdfe0fae00f11d882665c40ee4773
Parents: 73ed127
Author: Andrew Purtell <ap...@apache.org>
Authored: Tue Jan 23 18:37:33 2018 -0800
Committer: Andrew Purtell <ap...@apache.org>
Committed: Tue Jan 23 18:40:43 2018 -0800
----------------------------------------------------------------------
.../hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.java | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/3601bd29/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 350d850..e4401c0 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<TableName> specialTables;
- if(!master.isInitialized()) {
- specialTables = new ArrayList<TableName>();
- 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<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);
[2/2] hbase git commit: HBASE-19757 System table gets stuck after
enabling region server group feature in secure cluster
Posted by ap...@apache.org.
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 <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/636376b2
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/636376b2
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/636376b2
Branch: refs/heads/branch-1.4
Commit: 636376b28d1fed368d72b8f1c58d1bc437ffd5f8
Parents: a75533b
Author: Andrew Purtell <ap...@apache.org>
Authored: Tue Jan 23 18:37:33 2018 -0800
Committer: Andrew Purtell <ap...@apache.org>
Committed: Tue Jan 23 18:41:39 2018 -0800
----------------------------------------------------------------------
.../hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.java | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/636376b2/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 350d850..e4401c0 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<TableName> specialTables;
- if(!master.isInitialized()) {
- specialTables = new ArrayList<TableName>();
- 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<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);