From aec1897f31b269ee4de515aba29fb74cc281b63f Mon Sep 17 00:00:00 2001 From: haxiaolin Date: Fri, 9 Feb 2018 10:52:01 +0800 Subject: [PATCH] HBASE-19937 Ensure createRSGroupTable be called after ProcedureExecutor and LoadBalancer are initialized --- .../hbase/rsgroup/RSGroupBasedLoadBalancer.java | 6 ++ .../hadoop/hbase/rsgroup/RSGroupInfoManager.java | 2 + .../hbase/rsgroup/RSGroupInfoManagerImpl.java | 6 +- .../hadoop/hbase/rsgroup/TestEnableRSGroup.java | 75 ++++++++++++++++++++++ 4 files changed, 88 insertions(+), 1 deletion(-) create mode 100644 hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestEnableRSGroup.java 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()); diff --git a/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestEnableRSGroup.java b/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestEnableRSGroup.java new file mode 100644 index 0000000..d403722 --- /dev/null +++ b/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestEnableRSGroup.java @@ -0,0 +1,75 @@ +package org.apache.hadoop.hbase.rsgroup; + +import java.io.IOException; + +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hbase.HBaseClassTestRule; +import org.apache.hadoop.hbase.HBaseTestingUtility; +import org.apache.hadoop.hbase.HConstants; +import org.apache.hadoop.hbase.coprocessor.CoprocessorHost; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.ClassRule; +import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import static java.lang.Thread.sleep; +import static org.apache.hadoop.hbase.coprocessor.CoprocessorHost.COPROCESSORS_ENABLED_CONF_KEY; +import static org.junit.Assert.assertTrue; + +/** + * Test enable RSGroup + */ +@Category({ MediumTests.class }) public class TestEnableRSGroup { + + @ClassRule public static final HBaseClassTestRule CLASS_RULE = + HBaseClassTestRule.forClass(TestEnableRSGroup.class); + + protected static final Logger LOG = LoggerFactory.getLogger(TestEnableRSGroup.class); + + private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); + private static Configuration conf = TEST_UTIL.getConfiguration(); + + @BeforeClass public static void setUp() throws Exception { + conf.setBoolean(COPROCESSORS_ENABLED_CONF_KEY, true); + TEST_UTIL.startMiniCluster(5); + } + + @AfterClass public static void tearDown() throws Exception { + LOG.info("to stop miniCluster"); + TEST_UTIL.shutdownMiniCluster(); + } + + @Test public void testEnableRSGroup() throws IOException, InterruptedException { + TEST_UTIL.getMiniHBaseCluster().stopMaster(0); + + LOG.info("stopped master..."); + conf.set(CoprocessorHost.MASTER_COPROCESSOR_CONF_KEY, + RSGroupAdminEndpoint.class.getName()); + conf.set(HConstants.HBASE_MASTER_LOADBALANCER_CLASS, + RSGroupBasedLoadBalancer.class.getName()); + TEST_UTIL.getMiniHBaseCluster().setConf(conf); + + TEST_UTIL.getMiniHBaseCluster().startMaster(); + TEST_UTIL.getMiniHBaseCluster().waitForActiveAndReadyMaster(60000); + LOG.info("started master..."); + + // check if master started successfully + assertTrue(TEST_UTIL.getMiniHBaseCluster().getMaster() != null); + + // wait RSGroupBasedLoadBalancer online + RSGroupBasedLoadBalancer loadBalancer = + (RSGroupBasedLoadBalancer) TEST_UTIL.getMiniHBaseCluster().getMaster().getLoadBalancer(); + long current = System.currentTimeMillis(); + while (System.currentTimeMillis() - current <= 120000 && !loadBalancer.isOnline()) { + LOG.info("waiting for rsgroup load balancer onLine..."); + sleep(2000); + } + + assertTrue(loadBalancer.isOnline()); + } + +} -- 1.9.1