diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java index 9a2660a..feca9ad 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java @@ -1472,7 +1472,8 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility { setFirst(0); setSecond(0); }}; - for (int i = 0; status.getFirst() != 0 && i < 500; i++) { // wait up to 500 seconds + int i = 0; + do { status = admin.getAlterStatus(desc.getTableName()); if (status.getSecond() != 0) { LOG.debug(status.getSecond() - status.getFirst() + "/" + status.getSecond() @@ -1482,7 +1483,7 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility { LOG.debug("All regions updated."); break; } - } + } while (status.getFirst() != 0 && i++ < 500); if (status.getSecond() != 0) { throw new IOException("Failed to update replica count after 500 seconds."); } @@ -1496,7 +1497,7 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility { admin.disableTable(table); HTableDescriptor desc = admin.getTableDescriptor(table); desc.setRegionReplication(replicaCount); - modifyTableSync(admin, desc); + admin.modifyTable(desc.getTableName(), desc); admin.enableTable(table); }