You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by re...@apache.org on 2020/03/24 06:45:39 UTC
[hbase] branch branch-2.3 updated: Revert "[RSGroup] Forward-port
HBASE-22658 to master branch and branch-2.x (#1326)"
This is an automated email from the ASF dual-hosted git repository.
reidchan pushed a commit to branch branch-2.3
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.3 by this push:
new 1d988af Revert "[RSGroup] Forward-port HBASE-22658 to master branch and branch-2.x (#1326)"
1d988af is described below
commit 1d988afc9d2065a51fe74d0553f0943ef540dfaa
Author: Reid Chan <re...@apache.org>
AuthorDate: Tue Mar 24 14:41:33 2020 +0800
Revert "[RSGroup] Forward-port HBASE-22658 to master branch and branch-2.x (#1326)"
Reason: Invalid, branch-2 and master is different in RSGroup module.
This reverts commit 58b63e04c4af99a5730efb0a7e553be4d950e6a5
---
.../org/apache/hadoop/hbase/util/RegionMover.java | 27 +---
.../util/TestRegionMoverWithRSGroupEnable.java | 136 ---------------------
2 files changed, 2 insertions(+), 161 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 3733213..315a0a3 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
@@ -31,7 +31,6 @@ import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Collections;
import java.util.EnumSet;
import java.util.Iterator;
@@ -61,8 +60,6 @@ import org.apache.hadoop.hbase.client.ResultScanner;
import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.hbase.client.Table;
import org.apache.hadoop.hbase.filter.FirstKeyOnlyFilter;
-import org.apache.hadoop.hbase.net.Address;
-import org.apache.hadoop.hbase.rsgroup.RSGroupInfo;
import org.apache.yetus.audience.InterfaceAudience;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -419,9 +416,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) {
@@ -436,8 +431,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);
} catch (Exception e) {
@@ -453,22 +446,6 @@ public class RegionMover extends AbstractHBaseTool implements Closeable {
return waitTaskToFinish(unloadPool, unloadTask, "unloading");
}
- @VisibleForTesting
- Collection<ServerName> filterRSGroupServers(RSGroupInfo rsgroup,
- Collection<ServerName> onlineServers) {
- if (rsgroup.getName().equals(RSGroupInfo.DEFAULT_GROUP)) {
- return onlineServers;
- }
- List<ServerName> serverLists = new ArrayList<>(rsgroup.getServers().size());
- for (ServerName server : onlineServers) {
- Address address = Address.fromParts(server.getHostname(), server.getPort());
- if (rsgroup.containsServer(address)) {
- serverLists.add(server);
- }
- }
- return serverLists;
- }
-
private void unloadRegions(ServerName server, List<ServerName> regionServers,
List<RegionInfo> movedRegions) throws Exception {
while (true) {
@@ -813,4 +790,4 @@ public class RegionMover extends AbstractHBaseTool implements Closeable {
mover.doStaticMain(args);
}
}
-}
+}
\ No newline at end of file
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 3d3cdb2..0000000
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestRegionMoverWithRSGroupEnable.java
+++ /dev/null
@@ -1,136 +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 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.HBaseTestingUtility;
-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;
-import static org.junit.Assert.assertEquals;
-
-/**
- * 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 HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
- 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());
- }
-
-}