From bea56a2a8f45bd731de85dcd16915af64d837fc8 Mon Sep 17 00:00:00 2001 From: Umesh Agashe Date: Mon, 26 Jun 2017 15:10:19 -0700 Subject: [PATCH] HBASE-18261 Fix for unit test hbase.master.procedure.TestServerCrashProcedure#testRecoveryAndDoubleExecutionOnRsWithMeta() --- .../hadoop/hbase/master/procedure/MasterProcedureTestingUtility.java | 1 + .../apache/hadoop/hbase/master/procedure/TestServerCrashProcedure.java | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/MasterProcedureTestingUtility.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/MasterProcedureTestingUtility.java index 99dcf1dab68802319123496275cc5719116fc5a8..d8a69a61d6a55b7f4d49966c38b0176f38376902 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/MasterProcedureTestingUtility.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/MasterProcedureTestingUtility.java @@ -81,6 +81,7 @@ public class MasterProcedureTestingUtility { env.getMasterServices().getServerManager().removeRegion(regionState.getRegion()); } am.stop(); + master.setServerCrashProcessingEnabled(false); master.setInitialized(false); return null; } 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 b64905e2f531617e117aec8a00674601d8732795..d50e0a2afc0700ef3064f36f6f268b527d78deac 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 @@ -87,7 +87,6 @@ public class TestServerCrashProcedure { } @Test(timeout=60000) - @Ignore // Fix for AMv2 public void testRecoveryAndDoubleExecutionOnRsWithMeta() throws Exception { testRecoveryAndDoubleExecution(true); } -- 2.10.1 (Apple Git-78)