You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2020/06/09 00:46:38 UTC
[hbase] branch branch-2.2 updated: HBASE-24517
AssignmentManager.start should add meta region to ServerStateNode (#1866)
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2.2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.2 by this push:
new 1d47cb5 HBASE-24517 AssignmentManager.start should add meta region to ServerStateNode (#1866)
1d47cb5 is described below
commit 1d47cb52b0987cb25e407f13cd10884cdaec73f3
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Tue Jun 9 08:14:00 2020 +0800
HBASE-24517 AssignmentManager.start should add meta region to ServerStateNode (#1866)
Signed-off-by: Viraj Jasani <vj...@apache.org>
Signed-off-by: Wellington Ramos Chevreuil <wc...@apache.org>
---
.../hbase/master/assignment/AssignmentManager.java | 18 +++--
.../TestAssignmentManagerLoadMetaRegionState.java | 76 ++++++++++++++++++++++
2 files changed, 84 insertions(+), 10 deletions(-)
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManager.java
index 0a35226..7c81cd3 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManager.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManager.java
@@ -230,17 +230,15 @@ public class AssignmentManager {
RegionState regionState = MetaTableLocator.getMetaRegionState(zkw);
RegionStateNode regionNode =
regionStates.getOrCreateRegionStateNode(RegionInfoBuilder.FIRST_META_REGIONINFO);
- regionNode.lock();
- try {
- regionNode.setRegionLocation(regionState.getServerName());
- regionNode.setState(regionState.getState());
- if (regionNode.getProcedure() != null) {
- regionNode.getProcedure().stateLoaded(this, regionNode);
- }
- setMetaAssigned(regionState.getRegion(), regionState.getState() == State.OPEN);
- } finally {
- regionNode.unlock();
+ regionNode.setRegionLocation(regionState.getServerName());
+ regionNode.setState(regionState.getState());
+ if (regionNode.getProcedure() != null) {
+ regionNode.getProcedure().stateLoaded(this, regionNode);
+ }
+ if (regionState.getServerName() != null) {
+ regionStates.addRegionToServer(regionNode);
}
+ setMetaAssigned(regionState.getRegion(), regionState.getState() == State.OPEN);
}
}
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestAssignmentManagerLoadMetaRegionState.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestAssignmentManagerLoadMetaRegionState.java
new file mode 100644
index 0000000..d793748
--- /dev/null
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestAssignmentManagerLoadMetaRegionState.java
@@ -0,0 +1,76 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hbase.master.assignment;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import org.apache.hadoop.hbase.HBaseClassTestRule;
+import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.ServerName;
+import org.apache.hadoop.hbase.client.RegionInfo;
+import org.apache.hadoop.hbase.master.HMaster;
+import org.apache.hadoop.hbase.testclassification.MasterTests;
+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;
+
+@Category({ MasterTests.class, MediumTests.class })
+public class TestAssignmentManagerLoadMetaRegionState {
+
+ @ClassRule
+ public static final HBaseClassTestRule CLASS_RULE =
+ HBaseClassTestRule.forClass(TestAssignmentManagerLoadMetaRegionState.class);
+
+ private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
+
+ @BeforeClass
+ public static void setUp() throws Exception {
+ UTIL.startMiniCluster(1);
+ }
+
+ @AfterClass
+ public static void tearDown() throws Exception {
+ UTIL.shutdownMiniCluster();
+ }
+
+ @Test
+ public void testRestart() throws InterruptedException, IOException {
+ ServerName sn = UTIL.getMiniHBaseCluster().getRegionServer(0).getServerName();
+ AssignmentManager am = UTIL.getMiniHBaseCluster().getMaster().getAssignmentManager();
+ Set<RegionInfo> regions = new HashSet<>(am.getRegionsOnServer(sn));
+
+ UTIL.getMiniHBaseCluster().stopMaster(0).join();
+ HMaster newMaster = UTIL.getMiniHBaseCluster().startMaster().getMaster();
+ UTIL.waitFor(30000, () -> newMaster.isInitialized());
+
+ am = UTIL.getMiniHBaseCluster().getMaster().getAssignmentManager();
+ List<RegionInfo> newRegions = am.getRegionsOnServer(sn);
+ assertEquals(regions.size(), newRegions.size());
+ for (RegionInfo region : newRegions) {
+ assertTrue(regions.contains(region));
+ }
+ }
+}