anoopsjohn commented on a change in pull request #1841: URL: https://github.com/apache/hbase/pull/1841#discussion_r435967098
########## File path: hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin4.java ########## @@ -0,0 +1,65 @@ +/** + * 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.client; + +import static org.junit.Assert.*; + +import java.util.ArrayList; +import java.util.EnumSet; +import java.util.List; +import org.apache.hadoop.hbase.ClusterMetrics; +import org.apache.hadoop.hbase.HBaseClassTestRule; +import org.apache.hadoop.hbase.ServerName; +import org.apache.hadoop.hbase.testclassification.ClientTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.junit.ClassRule; +import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +@Category({ MediumTests.class, ClientTests.class }) +public class TestAdmin4 extends TestAdminBase{ + @ClassRule + public static final HBaseClassTestRule CLASS_RULE = + HBaseClassTestRule.forClass(TestAdmin4.class); + + // For HBASE-24208 + @Test + public void testDecommissionAndStopRegionServers() throws Exception { + List<ServerName> decommissionedRegionServers = ADMIN.listDecommissionedRegionServers(); + assertTrue(decommissionedRegionServers.isEmpty()); + + ArrayList<ServerName> clusterRegionServers = + new ArrayList<>(ADMIN.getClusterMetrics(EnumSet.of(ClusterMetrics.Option.LIVE_SERVERS)) + .getLiveServerMetrics().keySet()); + + List<ServerName> serversToDecommission = new ArrayList<ServerName>(); + serversToDecommission.add(clusterRegionServers.get(0)); + + // Decommission + ADMIN.decommissionRegionServers(serversToDecommission, true); + assertEquals(1, ADMIN.listDecommissionedRegionServers().size()); + + // Stop decommissioned region server and verify it is removed from draining znode + ServerName serverName = serversToDecommission.get(0); + ADMIN.stopRegionServer(serverName.getHostname()+":"+serverName.getPort()); + assertNotEquals("RS not removed from decommissioned list", -1, + TEST_UTIL.waitFor(1000, () -> ADMIN.listDecommissionedRegionServers().isEmpty())); Review comment: This asserts only the decommissionedRSs list maintained in the HM side. Pls add assert with checking the zk path also. We need to make sure the stop call actually deleted that zk path also. ########## File path: hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java ########## @@ -586,6 +587,15 @@ synchronized long expireServer(final ServerName serverName, boolean force) { } moveFromOnlineToDeadServers(serverName); + // If server is in draining mode, remove corresponding znode + String drainingZnode = ZNodePaths.joinZNode(master.getZooKeeper().getZNodePaths().drainingZNode, + serverName.getServerName()); + try { + ZKUtil.deleteNodeFailSilent(master.getZooKeeper(), drainingZnode); + } catch (KeeperException e) { + LOG.warn("Error deleting the znode for draining server " + serverName.getServerName(), e); Review comment: Can u change the log to say "Error deleting the draining znode for stopping server "+ serverName ########## File path: hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin4.java ########## @@ -0,0 +1,65 @@ +/** + * 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.client; + +import static org.junit.Assert.*; + +import java.util.ArrayList; +import java.util.EnumSet; +import java.util.List; +import org.apache.hadoop.hbase.ClusterMetrics; +import org.apache.hadoop.hbase.HBaseClassTestRule; +import org.apache.hadoop.hbase.ServerName; +import org.apache.hadoop.hbase.testclassification.ClientTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.junit.ClassRule; +import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +@Category({ MediumTests.class, ClientTests.class }) +public class TestAdmin4 extends TestAdminBase{ + @ClassRule + public static final HBaseClassTestRule CLASS_RULE = + HBaseClassTestRule.forClass(TestAdmin4.class); + + // For HBASE-24208 + @Test + public void testDecommissionAndStopRegionServers() throws Exception { + List<ServerName> decommissionedRegionServers = ADMIN.listDecommissionedRegionServers(); + assertTrue(decommissionedRegionServers.isEmpty()); + + ArrayList<ServerName> clusterRegionServers = Review comment: Cant we use Admin#getRegionServers(boolean excludeDecommissionedRS) API directly here? ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
