You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2017/06/28 23:02:02 UTC
hbase git commit: HBASE-18278 Enable and Fix for unit test
hbase.master.procedure.TestServerCrashProcedure#testRecoveryAndDoubleExecutionOnRsWithMeta
Repository: hbase
Updated Branches:
refs/heads/master a19e5673d -> 038d7e898
HBASE-18278 Enable and Fix for unit test hbase.master.procedure.TestServerCrashProcedure#testRecoveryAndDoubleExecutionOnRsWithMeta
Signed-off-by: Michael Stack <st...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/038d7e89
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/038d7e89
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/038d7e89
Branch: refs/heads/master
Commit: 038d7e89845c22e9fa3e9d3b770672686def2ea5
Parents: a19e567
Author: Umesh Agashe <ua...@cloudera.com>
Authored: Mon Jun 26 15:10:19 2017 -0700
Committer: Michael Stack <st...@apache.org>
Committed: Wed Jun 28 16:01:55 2017 -0700
----------------------------------------------------------------------
.../hbase/master/procedure/MasterProcedureTestingUtility.java | 1 +
.../hadoop/hbase/master/procedure/TestServerCrashProcedure.java | 2 --
2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/038d7e89/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/MasterProcedureTestingUtility.java
----------------------------------------------------------------------
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 99dcf1d..d8a69a6 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;
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/038d7e89/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestServerCrashProcedure.java
----------------------------------------------------------------------
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 b64905e..e2d894f 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);
}