### Eclipse Workspace Patch 1.0 #P apache-trunk Index: hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java (revision 1415412) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java (working copy) @@ -65,6 +65,7 @@ UTIL.startMiniCluster(slaves); HTable t = UTIL.createTable(Bytes.toBytes(TEST_TABLE), Bytes.toBytes(FAMILY)); UTIL.createMultiRegions(t, Bytes.toBytes(FAMILY)); + UTIL.waitTableAvailable(Bytes.toBytes(TEST_TABLE), 15 * 1000); t.close(); } @@ -242,7 +243,14 @@ table.flushCommits(); if (doAbort) { LOG.info("Aborted=" + UTIL.getMiniHBaseCluster().abortRegionServer(0)); - + // If we waiting for no regions being online after we abort the server, we + // could ensure the master has re-assigned the regions on killed server + // after putting keys successfully, it means the server we abort is dead + // and detected by matser + while (UTIL.getMiniHBaseCluster().getRegionServer(0) + .getNumberOfOnlineRegions() != 0) { + Thread.sleep(100); + } // try putting more keys after the abort. same key/qual... just validating // no exceptions thrown puts = constructPutRequests();