HBASE-24208 Remove RS entry from zk draining servers node after RS been stopped #1841
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
💔 -1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
virajjasani
reviewed
Jun 3, 2020
hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java
Outdated
Show resolved
Hide resolved
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| @Category({ LargeTests.class, ClientTests.class }) |
There was a problem hiding this comment.
MediumTests should be good here.
| @@ -573,6 +574,7 @@ public synchronized long expireServer(final ServerName serverName) { | |||
| } | |||
|
|
|||
| synchronized long expireServer(final ServerName serverName, boolean force) { | |||
| ZKWatcher zkw = master.getZooKeeper(); | |||
There was a problem hiding this comment.
We can include this inline directly on L591: ZNodePaths.joinZNode(master.getZooKeeper().getZNodePaths().drainingZNode....
Because for below 2 return statements, this just turns out to be redundant statement.
|
💔 -1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
virajjasani
reviewed
Jun 4, 2020
| @Category({ MediumTests.class, ClientTests.class }) | ||
| public class TestDecommissionStopAdminApi extends TestAdminBase{ | ||
| @ClassRule | ||
| public static final HBaseClassTestRule CLASS_RULE = HBaseClassTestRule.forClass(TestDecommissionStopAdminApi.class); |
There was a problem hiding this comment.
The line is exceeding 100 chars. Not sure why build didn't catch this as checkstyle issue. Anyways, you can bring it to 2 lines.
| @ClassRule | ||
| public static final HBaseClassTestRule CLASS_RULE = HBaseClassTestRule.forClass(TestDecommissionStopAdminApi.class); | ||
|
|
||
| private static final Logger LOG = LoggerFactory.getLogger(TestDecommissionStopAdminApi.class); |
| ServerName serverName = serversToDecommission.get(0); | ||
| ADMIN.stopRegionServer(serverName.getHostname()+":"+serverName.getPort()); | ||
| sleep(1000); | ||
| assertTrue(ADMIN.listDecommissionedRegionServers().isEmpty()); |
There was a problem hiding this comment.
Instead of relying on sleep (which usually results in flaky tests, works maybe 90% times, and 10% remains flaky), we can use Waiter.wait():
Something like this maybe:
assertNotEquals("Error message...xyz...", -1,
TEST_UTIL.waitFor(1000, () -> ADMIN.listDecommissionedRegionServers().isEmpty()));
Basically Waiter keeps executing the code until it has successfully returned true from the Predicate. If it can't even after timeout, it will return -1.
| import org.slf4j.LoggerFactory; | ||
|
|
||
| @Category({ MediumTests.class, ClientTests.class }) | ||
| public class TestDecommissionStopAdminApi extends TestAdminBase{ |
There was a problem hiding this comment.
Btw, we can put testDecommissionAndStopRegionServers() in TestAdmin2 or TestAdmin3. They are already LargeTests and have good no of Admin tests. However, keeping this test in separate file is also good. Maybe we can rename this class to TestAdmin4? This way, new Admin tests can be written in this class going forward.
| import org.apache.hadoop.hbase.TableName; | ||
| import org.apache.hadoop.hbase.testclassification.ClientTests; | ||
| import org.apache.hadoop.hbase.testclassification.MediumTests; | ||
| import org.junit.Before; |
There was a problem hiding this comment.
Before, TableName and HBaseTestingUtility are unused imports.
|
🎊 +1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
virajjasani
reviewed
Jun 4, 2020
hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin4.java
Outdated
Show resolved
Hide resolved
|
🎊 +1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
anoopsjohn
reviewed
Jun 5, 2020
hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java
Outdated
Show resolved
Hide resolved
| List<ServerName> decommissionedRegionServers = ADMIN.listDecommissionedRegionServers(); | ||
| assertTrue(decommissionedRegionServers.isEmpty()); | ||
|
|
||
| ArrayList<ServerName> clusterRegionServers = |
There was a problem hiding this comment.
Cant we use Admin#getRegionServers(boolean excludeDecommissionedRS) API directly here?
hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin4.java
Outdated
Show resolved
Hide resolved
|
💔 -1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
anoopsjohn
approved these changes
Jun 6, 2020
|
💔 -1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
|
@gkanade Can you please check test failure locally? I am not getting NPE on master branch. However, last couple of builds have consistent failures: |
|
🎊 +1 overall
This message was automatically generated. |
|
@virajjasani @anoopsjohn i made the fix and now verifies this works locally (the issue was one of the tests was not initializing zk instance for HM so i just put a null check around my code), this should work plz review |
|
+1 |
|
💔 -1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
|
The build is green for us (failed QA is not relevant). |
virajjasani
pushed a commit
that referenced
this pull request
Jun 8, 2020
…en stopped (#1841) Signed-off-by: Anoop Sam John <anoopsamjohn@apache.org> Signed-off-by: Viraj Jasani <vjasani@apache.org>
clarax
pushed a commit
to clarax/hbase
that referenced
this pull request
Nov 15, 2020
…en stopped (apache#1841) Signed-off-by: Anoop Sam John <anoopsamjohn@apache.org> Signed-off-by: Viraj Jasani <vjasani@apache.org>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
removed RS entry from zk draining server znode on RS stopped