From 7cc458e129cf7c55910c9985d0824a72189a1a73 Mon Sep 17 00:00:00 2001 From: Umesh Agashe Date: Wed, 21 Jun 2017 14:56:24 -0700 Subject: [PATCH] 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 --- .../hadoop/hbase/master/procedure/ServerCrashProcedure.java | 2 +- .../hadoop/hbase/master/procedure/TestServerCrashProcedure.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ServerCrashProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ServerCrashProcedure.java index c6cd861884a..db4ac327bb0 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ServerCrashProcedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ServerCrashProcedure.java @@ -150,7 +150,7 @@ implements ServerProcedureInterface { case SERVER_CRASH_GET_REGIONS: // If hbase:meta is not assigned, yield. - if (env.getAssignmentManager().waitMetaInitialized(this)) { + if (env.getAssignmentManager().waitMetaLoaded(this)) { throw new ProcedureSuspendedException(); } diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestServerCrashProcedure.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestServerCrashProcedure.java index e34e3582ad8..b64905e2f53 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestServerCrashProcedure.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestServerCrashProcedure.java @@ -93,7 +93,6 @@ public class TestServerCrashProcedure { } @Test(timeout=60000) - @Ignore // Fix for AMv2 public void testRecoveryAndDoubleExecutionOnRsWithoutMeta() throws Exception { testRecoveryAndDoubleExecution(false); }