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

HBASE-18278 Enable and Fix for unit test hbase.master.procedure.TestServerCrashProcedure#testRecoveryAndDoubleExecutionOnRsWithMeta 

Signed-off-by: Michael Stack <stack@apache.org>
This commit is contained in:
Umesh Agashe 2017-06-26 15:10:19 -07:00 committed by Michael Stack
parent a19e5673d6
commit 038d7e8984
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,6 +81,7 @@ public class MasterProcedureTestingUtility {
env.getMasterServices().getServerManager().removeRegion(regionState.getRegion()); env.getMasterServices().getServerManager().removeRegion(regionState.getRegion());
} }
am.stop(); am.stop();
master.setServerCrashProcessingEnabled(false);
master.setInitialized(false); master.setInitialized(false);
return null; return null;
} }

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

@ -39,7 +39,6 @@ import org.apache.hadoop.hbase.testclassification.LargeTests;
import org.apache.hadoop.hbase.testclassification.MasterTests; import org.apache.hadoop.hbase.testclassification.MasterTests;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.junit.experimental.categories.Category; import org.junit.experimental.categories.Category;
@ -87,7 +86,6 @@ public class TestServerCrashProcedure {
} }
@Test(timeout=60000) @Test(timeout=60000)
@Ignore // Fix for AMv2
public void testRecoveryAndDoubleExecutionOnRsWithMeta() throws Exception { public void testRecoveryAndDoubleExecutionOnRsWithMeta() throws Exception {
testRecoveryAndDoubleExecution(true); testRecoveryAndDoubleExecution(true);
} }