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 2024/09/28 14:11:44 UTC
(hbase) branch master updated (2ba008640cf -> 88c8e2e5b9e)
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git
from 2ba008640cf HBASE-22484 Javadoc Warnings: Fix warnings coming due to @result tag in TestCoprocessorWhitelistMasterObserver (#256)
new 7e8af9e6558 Revert "[RSGroup] Forward-port HBASE-22658 to master branch and branch-2.x (#1326)"
new 88c8e2e5b9e HBASE-22740 [RSGroup] Forward-port HBASE-22658 to master branch and branch-2.x (#1326)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
(hbase) 01/02: Revert "[RSGroup] Forward-port HBASE-22658 to master branch and branch-2.x (#1326)"
Posted by zh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 7e8af9e65582629f4ed206910bd091705a1183d1
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Sat Sep 28 21:58:32 2024 +0800
Revert "[RSGroup] Forward-port HBASE-22658 to master branch and branch-2.x (#1326)"
Missed jira id
This reverts commit bdcfd6a4a86f892667dfa308639b0b02b6ab6d86.
---
.../org/apache/hadoop/hbase/util/RegionMover.java | 6 +-
.../util/TestRegionMoverWithRSGroupEnable.java | 135 ---------------------
2 files changed, 1 insertion(+), 140 deletions(-)
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionMover.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionMover.java
index c1f98edd75a..89c865a5279 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionMover.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionMover.java
@@ -456,9 +456,7 @@ public class RegionMover extends AbstractHBaseTool implements Closeable {
try {
// Get Online RegionServers
List<ServerName> regionServers = new ArrayList<>();
- RSGroupInfo rsgroup = admin.getRSGroup(Address.fromParts(hostname, port));
- LOG.info("{} belongs to {}", hostname, rsgroup.getName());
- regionServers.addAll(filterRSGroupServers(rsgroup, admin.getRegionServers()));
+ regionServers.addAll(admin.getRegionServers());
// Remove the host Region server from target Region Servers list
ServerName server = stripServer(regionServers, hostname, port);
if (server == null) {
@@ -502,8 +500,6 @@ public class RegionMover extends AbstractHBaseTool implements Closeable {
if (regionServers.isEmpty()) {
LOG.warn("No Regions were moved - no servers available");
return false;
- } else {
- LOG.info("Available servers {}", regionServers);
}
unloadRegions(server, regionServers, movedRegions, isolateRegionIdArray);
} catch (Exception e) {
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestRegionMoverWithRSGroupEnable.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestRegionMoverWithRSGroupEnable.java
deleted file mode 100644
index 56e103aa612..00000000000
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestRegionMoverWithRSGroupEnable.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * 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.util;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtil;
-import org.apache.hadoop.hbase.ServerName;
-import org.apache.hadoop.hbase.TableName;
-import org.apache.hadoop.hbase.client.Admin;
-import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;
-import org.apache.hadoop.hbase.client.TableDescriptor;
-import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
-import org.apache.hadoop.hbase.net.Address;
-import org.apache.hadoop.hbase.regionserver.HRegionServer;
-import org.apache.hadoop.hbase.rsgroup.RSGroupInfo;
-import org.apache.hadoop.hbase.rsgroup.RSGroupUtil;
-import org.apache.hadoop.hbase.testclassification.MediumTests;
-import org.apache.hadoop.hbase.testclassification.MiscTests;
-import org.apache.hadoop.hbase.util.RegionMover.RegionMoverBuilder;
-import org.junit.AfterClass;
-import org.junit.Before;
-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;
-
-/**
- * Test for rsgroup enable, unloaded regions from decommissoned host of a rsgroup should be assigned
- * to those regionservers belonging to the same rsgroup.
- */
-@Category({ MiscTests.class, MediumTests.class })
-public class TestRegionMoverWithRSGroupEnable {
-
- @ClassRule
- public static final HBaseClassTestRule CLASS_RULE =
- HBaseClassTestRule.forClass(TestRegionMoverWithRSGroupEnable.class);
-
- private static final Logger LOG = LoggerFactory.getLogger(TestRegionMoverWithRSGroupEnable.class);
- private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
- private static final String TEST_RSGROUP = "test";
-
- @BeforeClass
- public static void setUpBeforeClass() throws Exception {
- RSGroupUtil.enableRSGroup(TEST_UTIL.getConfiguration());
- TEST_UTIL.startMiniCluster(5);
- }
-
- @AfterClass
- public static void tearDownAfterClass() throws Exception {
- TEST_UTIL.shutdownMiniCluster();
- }
-
- private final List<Address> rsservers = new ArrayList<>(2);
-
- @Before
- public void setUp() throws Exception {
- Admin admin = TEST_UTIL.getAdmin();
-
- // Add a new rsgroup and assign two servers to it.
- admin.addRSGroup(TEST_RSGROUP);
- Collection<ServerName> allServers = admin.getRegionServers();
- // Remove rs contains hbase:meta, otherwise test looks unstable and buggy in test env.
- ServerName rsContainMeta = TEST_UTIL.getMiniHBaseCluster().getRegionServerThreads().stream()
- .map(t -> t.getRegionServer())
- .filter(rs -> rs.getRegions(TableName.META_TABLE_NAME).size() > 0).findFirst().get()
- .getServerName();
- LOG.info("{} contains hbase:meta", rsContainMeta);
- List<ServerName> modifiable = new ArrayList<>(allServers);
- modifiable.remove(rsContainMeta);
- int i = 0;
- for (ServerName server : modifiable) {
- if (i == 2) break;
- rsservers.add(Address.fromParts(server.getHostname(), server.getPort()));
- i++;
- }
- admin.moveServersToRSGroup(new HashSet<>(rsservers), TEST_RSGROUP);
- LOG.info("Servers in {} are {}", TEST_RSGROUP, rsservers);
- assertEquals(3, admin.getRSGroup(RSGroupInfo.DEFAULT_GROUP).getServers().size());
- assertEquals(2, admin.getRSGroup(TEST_RSGROUP).getServers().size());
-
- // Create a pre-split table in test rsgroup
- TableName tableName = TableName.valueOf("testRegionMoverWithRSGroupEnable");
- if (admin.tableExists(tableName)) {
- TEST_UTIL.deleteTable(tableName);
- }
- TableDescriptor tableDesc = TableDescriptorBuilder.newBuilder(tableName)
- .setColumnFamily(ColumnFamilyDescriptorBuilder.of("f")).setRegionServerGroup(TEST_RSGROUP)
- .build();
- String startKey = "a";
- String endKey = "z";
- admin.createTable(tableDesc, Bytes.toBytes(startKey), Bytes.toBytes(endKey), 9);
- }
-
- @Test
- public void testUnloadRegions() throws Exception {
- Address decommission = rsservers.get(0);
- Address online = rsservers.get(1);
- String filename = new Path(TEST_UTIL.getDataTestDir(), "testRSGroupUnload").toString();
- RegionMoverBuilder builder =
- new RegionMoverBuilder(decommission.toString(), TEST_UTIL.getConfiguration());
- try (RegionMover rm = builder.filename(filename).ack(true).build()) {
- LOG.info("Unloading " + decommission.getHostname());
- rm.unload();
- }
- HRegionServer onlineRS = TEST_UTIL.getMiniHBaseCluster().getRegionServerThreads().stream()
- .map(JVMClusterUtil.RegionServerThread::getRegionServer)
- .filter(rs -> rs.getServerName().getAddress().equals(online)).findFirst().get();
- assertEquals(9, onlineRS.getNumberOfOnlineRegions());
- }
-
-}
(hbase) 02/02: HBASE-22740 [RSGroup] Forward-port HBASE-22658 to master branch and branch-2.x (#1326)
Posted by zh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 88c8e2e5b9ef0cb6b97f384d412217d061f1f724
Author: Reid Chan <re...@apache.org>
AuthorDate: Tue Mar 24 10:34:12 2020 +0800
HBASE-22740 [RSGroup] Forward-port HBASE-22658 to master branch and branch-2.x (#1326)
Signed-off-by: stack <st...@apache.org>
---
.../org/apache/hadoop/hbase/util/RegionMover.java | 6 +-
.../util/TestRegionMoverWithRSGroupEnable.java | 135 +++++++++++++++++++++
2 files changed, 140 insertions(+), 1 deletion(-)
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionMover.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionMover.java
index 89c865a5279..c1f98edd75a 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionMover.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionMover.java
@@ -456,7 +456,9 @@ public class RegionMover extends AbstractHBaseTool implements Closeable {
try {
// Get Online RegionServers
List<ServerName> regionServers = new ArrayList<>();
- regionServers.addAll(admin.getRegionServers());
+ RSGroupInfo rsgroup = admin.getRSGroup(Address.fromParts(hostname, port));
+ LOG.info("{} belongs to {}", hostname, rsgroup.getName());
+ regionServers.addAll(filterRSGroupServers(rsgroup, admin.getRegionServers()));
// Remove the host Region server from target Region Servers list
ServerName server = stripServer(regionServers, hostname, port);
if (server == null) {
@@ -500,6 +502,8 @@ public class RegionMover extends AbstractHBaseTool implements Closeable {
if (regionServers.isEmpty()) {
LOG.warn("No Regions were moved - no servers available");
return false;
+ } else {
+ LOG.info("Available servers {}", regionServers);
}
unloadRegions(server, regionServers, movedRegions, isolateRegionIdArray);
} catch (Exception e) {
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestRegionMoverWithRSGroupEnable.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestRegionMoverWithRSGroupEnable.java
new file mode 100644
index 00000000000..56e103aa612
--- /dev/null
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestRegionMoverWithRSGroupEnable.java
@@ -0,0 +1,135 @@
+/*
+ * 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.util;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hbase.HBaseClassTestRule;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
+import org.apache.hadoop.hbase.ServerName;
+import org.apache.hadoop.hbase.TableName;
+import org.apache.hadoop.hbase.client.Admin;
+import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;
+import org.apache.hadoop.hbase.client.TableDescriptor;
+import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
+import org.apache.hadoop.hbase.net.Address;
+import org.apache.hadoop.hbase.regionserver.HRegionServer;
+import org.apache.hadoop.hbase.rsgroup.RSGroupInfo;
+import org.apache.hadoop.hbase.rsgroup.RSGroupUtil;
+import org.apache.hadoop.hbase.testclassification.MediumTests;
+import org.apache.hadoop.hbase.testclassification.MiscTests;
+import org.apache.hadoop.hbase.util.RegionMover.RegionMoverBuilder;
+import org.junit.AfterClass;
+import org.junit.Before;
+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;
+
+/**
+ * Test for rsgroup enable, unloaded regions from decommissoned host of a rsgroup should be assigned
+ * to those regionservers belonging to the same rsgroup.
+ */
+@Category({ MiscTests.class, MediumTests.class })
+public class TestRegionMoverWithRSGroupEnable {
+
+ @ClassRule
+ public static final HBaseClassTestRule CLASS_RULE =
+ HBaseClassTestRule.forClass(TestRegionMoverWithRSGroupEnable.class);
+
+ private static final Logger LOG = LoggerFactory.getLogger(TestRegionMoverWithRSGroupEnable.class);
+ private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
+ private static final String TEST_RSGROUP = "test";
+
+ @BeforeClass
+ public static void setUpBeforeClass() throws Exception {
+ RSGroupUtil.enableRSGroup(TEST_UTIL.getConfiguration());
+ TEST_UTIL.startMiniCluster(5);
+ }
+
+ @AfterClass
+ public static void tearDownAfterClass() throws Exception {
+ TEST_UTIL.shutdownMiniCluster();
+ }
+
+ private final List<Address> rsservers = new ArrayList<>(2);
+
+ @Before
+ public void setUp() throws Exception {
+ Admin admin = TEST_UTIL.getAdmin();
+
+ // Add a new rsgroup and assign two servers to it.
+ admin.addRSGroup(TEST_RSGROUP);
+ Collection<ServerName> allServers = admin.getRegionServers();
+ // Remove rs contains hbase:meta, otherwise test looks unstable and buggy in test env.
+ ServerName rsContainMeta = TEST_UTIL.getMiniHBaseCluster().getRegionServerThreads().stream()
+ .map(t -> t.getRegionServer())
+ .filter(rs -> rs.getRegions(TableName.META_TABLE_NAME).size() > 0).findFirst().get()
+ .getServerName();
+ LOG.info("{} contains hbase:meta", rsContainMeta);
+ List<ServerName> modifiable = new ArrayList<>(allServers);
+ modifiable.remove(rsContainMeta);
+ int i = 0;
+ for (ServerName server : modifiable) {
+ if (i == 2) break;
+ rsservers.add(Address.fromParts(server.getHostname(), server.getPort()));
+ i++;
+ }
+ admin.moveServersToRSGroup(new HashSet<>(rsservers), TEST_RSGROUP);
+ LOG.info("Servers in {} are {}", TEST_RSGROUP, rsservers);
+ assertEquals(3, admin.getRSGroup(RSGroupInfo.DEFAULT_GROUP).getServers().size());
+ assertEquals(2, admin.getRSGroup(TEST_RSGROUP).getServers().size());
+
+ // Create a pre-split table in test rsgroup
+ TableName tableName = TableName.valueOf("testRegionMoverWithRSGroupEnable");
+ if (admin.tableExists(tableName)) {
+ TEST_UTIL.deleteTable(tableName);
+ }
+ TableDescriptor tableDesc = TableDescriptorBuilder.newBuilder(tableName)
+ .setColumnFamily(ColumnFamilyDescriptorBuilder.of("f")).setRegionServerGroup(TEST_RSGROUP)
+ .build();
+ String startKey = "a";
+ String endKey = "z";
+ admin.createTable(tableDesc, Bytes.toBytes(startKey), Bytes.toBytes(endKey), 9);
+ }
+
+ @Test
+ public void testUnloadRegions() throws Exception {
+ Address decommission = rsservers.get(0);
+ Address online = rsservers.get(1);
+ String filename = new Path(TEST_UTIL.getDataTestDir(), "testRSGroupUnload").toString();
+ RegionMoverBuilder builder =
+ new RegionMoverBuilder(decommission.toString(), TEST_UTIL.getConfiguration());
+ try (RegionMover rm = builder.filename(filename).ack(true).build()) {
+ LOG.info("Unloading " + decommission.getHostname());
+ rm.unload();
+ }
+ HRegionServer onlineRS = TEST_UTIL.getMiniHBaseCluster().getRegionServerThreads().stream()
+ .map(JVMClusterUtil.RegionServerThread::getRegionServer)
+ .filter(rs -> rs.getServerName().getAddress().equals(online)).findFirst().get();
+ assertEquals(9, onlineRS.getNumberOfOnlineRegions());
+ }
+
+}