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

HBASE-18254 ServerCrashProcedure checks and waits for meta initialized, instead should check and wait for meta loaded 

After enabling test hbase.master.procedure.TestServerCrashProcedure#testRecoveryAndDoubleExecutionOnRsWithMeta, this bug is found in ServerCrashProcedure

Signed-off-by: Michael Stack <stack@apache.org>
This commit is contained in:
Umesh Agashe 2017-06-21 14:56:24 -07:00 committed by Michael Stack
parent 9cb5fc9825
commit 7cc458e129
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ServerCrashProcedure.java
View File

@ -150,7 +150,7 @@ implements ServerProcedureInterface {
case SERVER_CRASH_GET_REGIONS: case SERVER_CRASH_GET_REGIONS:
// If hbase:meta is not assigned, yield. // If hbase:meta is not assigned, yield.
if (env.getAssignmentManager().waitMetaInitialized(this)) { if (env.getAssignmentManager().waitMetaLoaded(this)) {
throw new ProcedureSuspendedException(); throw new ProcedureSuspendedException();
} }

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

@ -93,7 +93,6 @@ public class TestServerCrashProcedure {
} }
@Test(timeout=60000) @Test(timeout=60000)
@Ignore // Fix for AMv2
public void testRecoveryAndDoubleExecutionOnRsWithoutMeta() throws Exception { public void testRecoveryAndDoubleExecutionOnRsWithoutMeta() throws Exception {
testRecoveryAndDoubleExecution(false); testRecoveryAndDoubleExecution(false);
} }