From f96d2e4f054211f59204f274aea32fa44d72aaf9 Mon Sep 17 00:00:00 2001 From: Umesh Agashe Date: Mon, 26 Jun 2017 15:10:19 -0700 Subject: [PATCH] HBASE-18278 Enable and Fix for unit test hbase.master.procedure.TestServerCrashProcedure#testRecoveryAndDoubleExecutionOnRsWithMeta --- .../hadoop/hbase/master/procedure/MasterProcedureTestingUtility.java | 1 + .../apache/hadoop/hbase/master/procedure/TestServerCrashProcedure.java | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) 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..e2d894f56ff2a8642a932a9e42b314015f5beb5b 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 @@ -39,7 +39,6 @@ import org.apache.hadoop.hbase.testclassification.LargeTests; import org.apache.hadoop.hbase.testclassification.MasterTests; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -87,7 +86,6 @@ public class TestServerCrashProcedure { } @Test(timeout=60000) - @Ignore // Fix for AMv2 public void testRecoveryAndDoubleExecutionOnRsWithMeta() throws Exception { testRecoveryAndDoubleExecution(true); } -- 2.10.1 (Apple Git-78)