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

HBASE-8862 TestAdmin#testForceSplitMultiFamily is flaky 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1500910 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
jxiang 2013-07-08 19:47:50 +00:00
parent 0b0cccb61d
commit 17d2514110
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java
View File

@ -38,7 +38,6 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.apache.commons.logging.impl.Log4JLogger;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.*; import org.apache.hadoop.hbase.*;
import org.apache.hadoop.hbase.catalog.CatalogTracker; import org.apache.hadoop.hbase.catalog.CatalogTracker;
@ -52,8 +51,6 @@ import org.apache.hadoop.hbase.exceptions.TableNotEnabledException;
import org.apache.hadoop.hbase.exceptions.TableNotFoundException; import org.apache.hadoop.hbase.exceptions.TableNotFoundException;
import org.apache.hadoop.hbase.exceptions.ZooKeeperConnectionException; import org.apache.hadoop.hbase.exceptions.ZooKeeperConnectionException;
import org.apache.hadoop.hbase.executor.EventHandler; import org.apache.hadoop.hbase.executor.EventHandler;
import org.apache.hadoop.hbase.ipc.RpcClient;
import org.apache.hadoop.hbase.ipc.RpcServer;
import org.apache.hadoop.hbase.master.AssignmentManager; import org.apache.hadoop.hbase.master.AssignmentManager;
import org.apache.hadoop.hbase.master.HMaster; import org.apache.hadoop.hbase.master.HMaster;
import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.protobuf.ProtobufUtil;
@ -64,7 +61,6 @@ import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.Pair; import org.apache.hadoop.hbase.util.Pair;
import org.apache.hadoop.hbase.zookeeper.ZKTableReadOnly; import org.apache.hadoop.hbase.zookeeper.ZKTableReadOnly;
import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;
import org.apache.log4j.Level;
import org.junit.*; import org.junit.*;
import org.junit.experimental.categories.Category; import org.junit.experimental.categories.Category;
@ -977,6 +973,9 @@ public class TestAdmin {
// Scan first row so we are into first region before split happens. // Scan first row so we are into first region before split happens.
scanner.next(); scanner.next();
// Split the table
this.admin.split(tableName, splitPoint);
final AtomicInteger count = new AtomicInteger(0); final AtomicInteger count = new AtomicInteger(0);
Thread t = new Thread("CheckForSplit") { Thread t = new Thread("CheckForSplit") {
public void run() { public void run() {
@ -998,11 +997,11 @@ public class TestAdmin {
if (count.get() >= 2) break; if (count.get() >= 2) break;
LOG.debug("Cycle waiting on split"); LOG.debug("Cycle waiting on split");
} }
LOG.debug("CheckForSplit thread exited, current region count: " + count.get());
} }
}; };
t.setPriority(Thread.NORM_PRIORITY - 2);
t.start(); t.start();
// Split the table
this.admin.split(tableName, splitPoint);
t.join(); t.join();
// Verify row count // Verify row count
@ -1039,9 +1038,14 @@ public class TestAdmin {
// check if splitKey is based on the largest column family // check if splitKey is based on the largest column family
// in terms of it store size // in terms of it store size
int deltaForLargestFamily = Math.abs(rowCount/2 - splitKey); int deltaForLargestFamily = Math.abs(rowCount/2 - splitKey);
LOG.debug("SplitKey=" + splitKey + "&deltaForLargestFamily=" + deltaForLargestFamily);
for (int index = 0; index < familyNames.length; index++) { for (int index = 0; index < familyNames.length; index++) {
int delta = Math.abs(rowCounts[index]/2 - splitKey); int delta = Math.abs(rowCounts[index]/2 - splitKey);
assertTrue(delta >= deltaForLargestFamily); if (delta < deltaForLargestFamily) {
assertTrue("Delta " + delta + " for family " + index
+ " should be at least deltaForLargestFamily " + deltaForLargestFamily,
false);
}
} }
} }
} }