From d95c89fcb6c94811dd28242a6ab97f2a05829cf6 Mon Sep 17 00:00:00 2001 From: haxiaolin Date: Tue, 6 Feb 2018 10:07:52 +0800 Subject: [PATCH] HBASE-19937 Enable rsgroup NPE in CreateTableProcedure --- .../org/apache/hadoop/hbase/rsgroup/RSGroupBasedLoadBalancer.java | 6 ++++++ .../java/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManager.java | 2 ++ .../org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.java | 6 +++++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupBasedLoadBalancer.java b/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupBasedLoadBalancer.java index c47972d..392cbab 100644 --- a/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupBasedLoadBalancer.java +++ b/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupBasedLoadBalancer.java @@ -386,6 +386,12 @@ public class RSGroupBasedLoadBalancer implements RSGroupableBalancer { throw new HBaseIOException(msg); } rsGroupInfoManager = cps.get(0).getGroupInfoManager(); + if(rsGroupInfoManager == null){ + String msg = "RSGroupInfoManager hasn't been initialized"; + LOG.error(msg); + throw new HBaseIOException(msg); + } + rsGroupInfoManager.start(); } } catch (IOException e) { throw new HBaseIOException("Failed to initialize GroupInfoManagerImpl", e); diff --git a/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManager.java b/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManager.java index b1ace48..b0cd5ff 100644 --- a/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManager.java +++ b/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManager.java @@ -48,6 +48,8 @@ public interface RSGroupInfoManager { byte[] META_QUALIFIER_BYTES = Bytes.toBytes("i"); byte[] ROW_KEY = {0}; + void start(); + /** * Add given RSGroupInfo to existing list of group infos. */ 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 fc55219..9294255 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 @@ -155,7 +155,6 @@ final class RSGroupInfoManagerImpl implements RSGroupInfoManager { private synchronized void init() throws IOException{ refresh(); - rsGroupStartupWorker.start(); serverEventsListenerThread.start(); masterServices.getServerManager().registerListener(serverEventsListenerThread); failedOpenUpdaterThread = new FailedOpenUpdaterThread(masterServices.getConfiguration()); @@ -169,6 +168,11 @@ final class RSGroupInfoManagerImpl implements RSGroupInfoManager { return instance; } + public void start(){ + // create system table of rsgroup + rsGroupStartupWorker.start(); + } + @Override public synchronized void addRSGroup(RSGroupInfo rsGroupInfo) throws IOException { checkGroupName(rsGroupInfo.getName()); -- 1.9.1