You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by mb...@apache.org on 2016/11/05 00:15:21 UTC
[1/2] hbase git commit: HBASE-16874 Fix
TestMasterFailoverWithProcedures and ensure single proc-executor for
kill/restart tests
Repository: hbase
Updated Branches:
refs/heads/branch-1.1 71a2e1f22 -> d9185de46
HBASE-16874 Fix TestMasterFailoverWithProcedures and ensure single proc-executor for kill/restart tests
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/3f5e6314
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/3f5e6314
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/3f5e6314
Branch: refs/heads/branch-1.1
Commit: 3f5e63145b4ea1d2b91e0e77a6d4edc45bfd3ed0
Parents: 71a2e1f
Author: Matteo Bertozzi <ma...@cloudera.com>
Authored: Wed Oct 19 13:06:48 2016 -0700
Committer: Matteo Bertozzi <ma...@cloudera.com>
Committed: Fri Nov 4 17:12:07 2016 -0700
----------------------------------------------------------------------
.../hbase/procedure2/ProcedureTestingUtility.java | 13 +++++++++++++
.../procedure/TestMasterFailoverWithProcedures.java | 1 +
2 files changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/3f5e6314/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/ProcedureTestingUtility.java
----------------------------------------------------------------------
diff --git a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/ProcedureTestingUtility.java b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/ProcedureTestingUtility.java
index 36c5a28..bffc53f 100644
--- a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/ProcedureTestingUtility.java
+++ b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/ProcedureTestingUtility.java
@@ -91,6 +91,7 @@ public class ProcedureTestingUtility {
}
procExecutor.testing.killBeforeStoreUpdate = value;
LOG.warn("Set Kill before store update to: " + procExecutor.testing.killBeforeStoreUpdate);
+ assertSingleExecutorForKillTests(procExecutor);
}
public static <TEnv> void setToggleKillBeforeStoreUpdate(ProcedureExecutor<TEnv> procExecutor,
@@ -99,6 +100,7 @@ public class ProcedureTestingUtility {
procExecutor.testing = new ProcedureExecutor.Testing();
}
procExecutor.testing.toggleKillBeforeStoreUpdate = value;
+ assertSingleExecutorForKillTests(procExecutor);
}
public static <TEnv> void toggleKillBeforeStoreUpdate(ProcedureExecutor<TEnv> procExecutor) {
@@ -107,12 +109,23 @@ public class ProcedureTestingUtility {
}
procExecutor.testing.killBeforeStoreUpdate = !procExecutor.testing.killBeforeStoreUpdate;
LOG.warn("Set Kill before store update to: " + procExecutor.testing.killBeforeStoreUpdate);
+ assertSingleExecutorForKillTests(procExecutor);
}
public static <TEnv> void setKillAndToggleBeforeStoreUpdate(ProcedureExecutor<TEnv> procExecutor,
boolean value) {
ProcedureTestingUtility.setKillBeforeStoreUpdate(procExecutor, value);
ProcedureTestingUtility.setToggleKillBeforeStoreUpdate(procExecutor, value);
+ assertSingleExecutorForKillTests(procExecutor);
+ }
+
+ private static <TEnv> void assertSingleExecutorForKillTests(final ProcedureExecutor<TEnv> procExecutor) {
+ if (procExecutor.testing == null) return;
+ if (procExecutor.testing.killBeforeStoreUpdate ||
+ procExecutor.testing.toggleKillBeforeStoreUpdate) {
+ assertEquals("expected only one executor running during test with kill/restart",
+ 1, procExecutor.getNumThreads());
+ }
}
public static <TEnv> long submitAndWait(ProcedureExecutor<TEnv> procExecutor, Procedure proc) {
http://git-wip-us.apache.org/repos/asf/hbase/blob/3f5e6314/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestMasterFailoverWithProcedures.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestMasterFailoverWithProcedures.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestMasterFailoverWithProcedures.java
index 6e967e1..dd032c4 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestMasterFailoverWithProcedures.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestMasterFailoverWithProcedures.java
@@ -69,6 +69,7 @@ public class TestMasterFailoverWithProcedures {
conf.setInt("hbase.procedure.store.wal.wait.before.roll", 0);
conf.setInt("hbase.procedure.store.wal.max.roll.retries", 1);
conf.setInt("hbase.procedure.store.wal.sync.failure.roll.max", 1);
+ conf.setInt(MasterProcedureConstants.MASTER_PROCEDURE_THREADS, 1);
}
@Before
[2/2] hbase git commit: HBASE-17022
TestMasterFailoverWithProcedures#testTruncateWithFailover fails constantly in
branch-1.1
Posted by mb...@apache.org.
HBASE-17022 TestMasterFailoverWithProcedures#testTruncateWithFailover fails constantly in branch-1.1
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d9185de4
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d9185de4
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d9185de4
Branch: refs/heads/branch-1.1
Commit: d9185de463358c4d5e053a2a02ee09d69c5f54e7
Parents: 3f5e631
Author: Matteo Bertozzi <ma...@cloudera.com>
Authored: Fri Nov 4 17:14:01 2016 -0700
Committer: Matteo Bertozzi <ma...@cloudera.com>
Committed: Fri Nov 4 17:14:01 2016 -0700
----------------------------------------------------------------------
.../hbase/master/procedure/TestMasterFailoverWithProcedures.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/d9185de4/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestMasterFailoverWithProcedures.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestMasterFailoverWithProcedures.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestMasterFailoverWithProcedures.java
index dd032c4..04f51a6 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestMasterFailoverWithProcedures.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestMasterFailoverWithProcedures.java
@@ -343,10 +343,10 @@ public class TestMasterFailoverWithProcedures {
UTIL.waitUntilAllRegionsAssigned(tableName);
// validate the table regions and layout
+ regions = UTIL.getHBaseAdmin().getTableRegions(tableName).toArray(new HRegionInfo[0]);
if (preserveSplits) {
- assertEquals(1 + splitKeys.length, UTIL.getHBaseAdmin().getTableRegions(tableName).size());
+ assertEquals(1 + splitKeys.length, regions.length);
} else {
- regions = UTIL.getHBaseAdmin().getTableRegions(tableName).toArray(new HRegionInfo[1]);
assertEquals(1, regions.length);
}
MasterProcedureTestingUtility.validateTableCreation(