-
Type:
Sub-task
-
Status: Closed
-
Priority:
Major
-
Resolution: Fixed
-
Affects Version/s: hbase-7290, 0.95.2
-
Fix Version/s: 0.95.0
-
Component/s: None
-
Labels:None
-
Hadoop Flags:Reviewed
Something in the merge has set the interrupted flag on the main test threads of TestReplicationDisabledinactivePeer, TestRestartCluster, and TestCatalogTrackerOnCluster.
These unacceptable hacks make the tests run and pass:
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/catalog/TestCatalogTrackerOnCluster.java b/hbase-server/src/test/java/or index f3e57d6..a8d2ef7 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/catalog/TestCatalogTrackerOnCluster.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/catalog/TestCatalogTrackerOnCluster.java @@ -47,6 +47,7 @@ public class TestCatalogTrackerOnCluster { // Shutdown hbase. UTIL.shutdownMiniHBaseCluster(); // Give the various ZKWatchers some time to settle their affairs. + Thread.interrupted(); // HACK clear interrupt state. Thread.sleep(1000); // Mess with the root location in the running zk. Set it to be nonsense. diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java b/hbase-server/src/test/java/org/apache/h index 15225e1..9f7f526 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java @@ -108,6 +108,7 @@ public class TestRestartCluster { UTIL.shutdownMiniHBaseCluster(); LOG.info("\n\nSleeping a bit"); + Thread.interrupted(); // HACK clear interrupt state. Thread.sleep(2000); LOG.info("\n\nStarting cluster the second time"); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationDisableInactivePeer.java b/hbase-server/src/t index b089fbe..8162f4b 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationDisableInactivePeer.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationDisableInactivePeer.java @@ -50,6 +50,7 @@ public class TestReplicationDisableInactivePeer extends TestReplicationBase { // enabling and shutdown the peer admin.enablePeer("2"); utility2.shutdownMiniHBaseCluster(); + Thread.interrupted(); // HACK clear interrupted flag. byte[] rowkey = Bytes.toBytes("disable inactive peer"); Put put = new Put(rowkey);
On the snapshot branch and on the trunk branch before the merge, these tests passed. Need to figure out how they combination caused this behavior change.
- is related to
-
HBASE-7475 TestUpgradeFromHFileV1ToEncoding.testUpgrade hangs
-
- Closed
-