Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-18491 [AMv2] Fail UnassignProcedure if source Region Server is not online. 

The patch also enables TestServerCrashProcedure.testRecoveryAndDoubleExecutionOnRsWithMeta()

Signed-off-by: Michael Stack <stack@apache.org>
This commit is contained in:
Umesh Agashe 2017-08-01 12:36:47 -07:00 committed by Michael Stack
parent 422a57223a
commit ba5e8706de
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/UnassignProcedure.java
View File

@ -161,9 +161,12 @@ public class UnassignProcedure extends RegionTransitionProcedure {
return false; return false;
} }
// if the server is down, mark the operation as complete // if the server is down, mark the operation as failed. region cannot be unassigned
// if server is down
if (serverCrashed.get() || !isServerOnline(env, regionNode)) { if (serverCrashed.get() || !isServerOnline(env, regionNode)) {
LOG.info("Server already down: " + this + "; " + regionNode.toShortString()); LOG.warn("Server already down: " + this + "; " + regionNode.toShortString());
setFailure("source region server not online",
new ServerCrashException(getProcId(), regionNode.getRegionLocation()));
return false; return false;
} }

1
hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestServerCrashProcedure.java
View File

@ -87,7 +87,6 @@ public class TestServerCrashProcedure {
testRecoveryAndDoubleExecution(false, false); testRecoveryAndDoubleExecution(false, false);
} }
@Ignore // HBASE-18366... To be enabled again.
@Test(timeout=60000) @Test(timeout=60000)
public void testRecoveryAndDoubleExecutionOnRsWithMeta() throws Exception { public void testRecoveryAndDoubleExecutionOnRsWithMeta() throws Exception {
testRecoveryAndDoubleExecution(true, true); testRecoveryAndDoubleExecution(true, true);