[42/44] hbase git commit: HBASE-13308 Fix flaky TestEndToEndSplitTransaction

2015-03-23 Thread mbertozzi 
HBASE-13308 Fix flaky TestEndToEndSplitTransaction


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/a9b73b60
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a9b73b60
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a9b73b60

Branch: refs/heads/hbase-12439
Commit: a9b73b600e551749358a61bab27588e9074132d9
Parents: 8dfed5d
Author: zhangduo zhang...@wandoujia.com
Authored: Sat Mar 21 18:15:23 2015 +0800
Committer: zhangduo zhang...@wandoujia.com
Committed: Sat Mar 21 20:43:53 2015 +0800

--
 .../TestEndToEndSplitTransaction.java   | 206 +--
 1 file changed, 95 insertions(+), 111 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/a9b73b60/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java
--
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java
index 30a0e88..523aadc 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java
@@ -25,10 +25,9 @@ import static org.junit.Assert.assertTrue;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
-import java.util.NavigableMap;
 import java.util.Random;
 import java.util.Set;
+import java.util.TreeSet;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
@@ -38,17 +37,16 @@ import org.apache.hadoop.hbase.ChoreService;
 import org.apache.hadoop.hbase.HBaseTestingUtility;
 import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.HRegionInfo;
+import org.apache.hadoop.hbase.HRegionLocation;
 import org.apache.hadoop.hbase.MetaTableAccessor;
 import org.apache.hadoop.hbase.NotServingRegionException;
 import org.apache.hadoop.hbase.ScheduledChore;
-import org.apache.hadoop.hbase.ServerName;
 import org.apache.hadoop.hbase.Stoppable;
 import org.apache.hadoop.hbase.TableName;
 import org.apache.hadoop.hbase.client.Admin;
 import org.apache.hadoop.hbase.client.Connection;
 import org.apache.hadoop.hbase.client.ConnectionFactory;
 import org.apache.hadoop.hbase.client.Get;
-import org.apache.hadoop.hbase.client.HConnection;
 import org.apache.hadoop.hbase.client.HTable;
 import org.apache.hadoop.hbase.client.Put;
 import org.apache.hadoop.hbase.client.Result;
@@ -60,7 +58,6 @@ import org.apache.hadoop.hbase.protobuf.RequestConverter;
 import org.apache.hadoop.hbase.protobuf.generated.ClientProtos;
 import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanRequest;
 import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos;
-import org.apache.hadoop.hbase.testclassification.FlakeyTests;
 import org.apache.hadoop.hbase.testclassification.LargeTests;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.util.Pair;
@@ -76,12 +73,11 @@ import com.google.common.collect.Iterators;
 import com.google.common.collect.Sets;
 import com.google.protobuf.ServiceException;
 
-@Category({FlakeyTests.class, LargeTests.class})
-@SuppressWarnings(deprecation)
+@Category(LargeTests.class)
 public class TestEndToEndSplitTransaction {
   private static final Log LOG = 
LogFactory.getLog(TestEndToEndSplitTransaction.class);
   private static final HBaseTestingUtility TEST_UTIL = new 
HBaseTestingUtility();
-  private static final Configuration conf = TEST_UTIL.getConfiguration();
+  private static final Configuration CONF = TEST_UTIL.getConfiguration();
 
   @BeforeClass
   public static void beforeAllTests() throws Exception {
@@ -96,70 +92,70 @@ public class TestEndToEndSplitTransaction {
 
   @Test
   public void testMasterOpsWhileSplitting() throws Exception {
-TableName tableName =
-TableName.valueOf(TestSplit);
+TableName tableName = TableName.valueOf(TestSplit);
 byte[] familyName = Bytes.toBytes(fam);
 try (HTable ht = TEST_UTIL.createTable(tableName, familyName)) {
   TEST_UTIL.loadTable(ht, familyName, false);
 }
 HRegionServer server = TEST_UTIL.getHBaseCluster().getRegionServer(0);
-byte []firstRow = Bytes.toBytes(aaa);
-byte []splitRow = Bytes.toBytes(lll);
-byte []lastRow = Bytes.toBytes(zzz);
-HConnection con = (HConnection) 
ConnectionFactory.createConnection(TEST_UTIL.getConfiguration());
-// this will also cache the region
-byte[] regionName = con.locateRegion(tableName, splitRow).getRegionInfo()
-.getRegionName();
-HRegion region = server.getRegion(regionName);
-SplitTransaction

hbase git commit: HBASE-13308 Fix flaky TestEndToEndSplitTransaction

2015-03-21 Thread zhangduo 
Repository: hbase
Updated Branches:
  refs/heads/master 8dfed5dc8 - a9b73b600


HBASE-13308 Fix flaky TestEndToEndSplitTransaction


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/a9b73b60
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a9b73b60
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a9b73b60

Branch: refs/heads/master
Commit: a9b73b600e551749358a61bab27588e9074132d9
Parents: 8dfed5d
Author: zhangduo zhang...@wandoujia.com
Authored: Sat Mar 21 18:15:23 2015 +0800
Committer: zhangduo zhang...@wandoujia.com
Committed: Sat Mar 21 20:43:53 2015 +0800

--
 .../TestEndToEndSplitTransaction.java   | 206 +--
 1 file changed, 95 insertions(+), 111 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/a9b73b60/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java
--
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java
index 30a0e88..523aadc 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java
@@ -25,10 +25,9 @@ import static org.junit.Assert.assertTrue;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
-import java.util.NavigableMap;
 import java.util.Random;
 import java.util.Set;
+import java.util.TreeSet;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
@@ -38,17 +37,16 @@ import org.apache.hadoop.hbase.ChoreService;
 import org.apache.hadoop.hbase.HBaseTestingUtility;
 import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.HRegionInfo;
+import org.apache.hadoop.hbase.HRegionLocation;
 import org.apache.hadoop.hbase.MetaTableAccessor;
 import org.apache.hadoop.hbase.NotServingRegionException;
 import org.apache.hadoop.hbase.ScheduledChore;
-import org.apache.hadoop.hbase.ServerName;
 import org.apache.hadoop.hbase.Stoppable;
 import org.apache.hadoop.hbase.TableName;
 import org.apache.hadoop.hbase.client.Admin;
 import org.apache.hadoop.hbase.client.Connection;
 import org.apache.hadoop.hbase.client.ConnectionFactory;
 import org.apache.hadoop.hbase.client.Get;
-import org.apache.hadoop.hbase.client.HConnection;
 import org.apache.hadoop.hbase.client.HTable;
 import org.apache.hadoop.hbase.client.Put;
 import org.apache.hadoop.hbase.client.Result;
@@ -60,7 +58,6 @@ import org.apache.hadoop.hbase.protobuf.RequestConverter;
 import org.apache.hadoop.hbase.protobuf.generated.ClientProtos;
 import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanRequest;
 import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos;
-import org.apache.hadoop.hbase.testclassification.FlakeyTests;
 import org.apache.hadoop.hbase.testclassification.LargeTests;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.util.Pair;
@@ -76,12 +73,11 @@ import com.google.common.collect.Iterators;
 import com.google.common.collect.Sets;
 import com.google.protobuf.ServiceException;
 
-@Category({FlakeyTests.class, LargeTests.class})
-@SuppressWarnings(deprecation)
+@Category(LargeTests.class)
 public class TestEndToEndSplitTransaction {
   private static final Log LOG = 
LogFactory.getLog(TestEndToEndSplitTransaction.class);
   private static final HBaseTestingUtility TEST_UTIL = new 
HBaseTestingUtility();
-  private static final Configuration conf = TEST_UTIL.getConfiguration();
+  private static final Configuration CONF = TEST_UTIL.getConfiguration();
 
   @BeforeClass
   public static void beforeAllTests() throws Exception {
@@ -96,70 +92,70 @@ public class TestEndToEndSplitTransaction {
 
   @Test
   public void testMasterOpsWhileSplitting() throws Exception {
-TableName tableName =
-TableName.valueOf(TestSplit);
+TableName tableName = TableName.valueOf(TestSplit);
 byte[] familyName = Bytes.toBytes(fam);
 try (HTable ht = TEST_UTIL.createTable(tableName, familyName)) {
   TEST_UTIL.loadTable(ht, familyName, false);
 }
 HRegionServer server = TEST_UTIL.getHBaseCluster().getRegionServer(0);
-byte []firstRow = Bytes.toBytes(aaa);
-byte []splitRow = Bytes.toBytes(lll);
-byte []lastRow = Bytes.toBytes(zzz);
-HConnection con = (HConnection) 
ConnectionFactory.createConnection(TEST_UTIL.getConfiguration());
-// this will also cache the region
-byte[] regionName = con.locateRegion(tableName, splitRow).getRegionInfo()
-.getRegionName();

hbase git commit: HBASE-13308 Fix flaky TestEndToEndSplitTransaction

2015-03-21 Thread zhangduo 
Repository: hbase
Updated Branches:
  refs/heads/branch-1 e90ac5f81 - bbf9a90ff


HBASE-13308 Fix flaky TestEndToEndSplitTransaction

Conflicts:

hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/bbf9a90f
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/bbf9a90f
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/bbf9a90f

Branch: refs/heads/branch-1
Commit: bbf9a90ff25b30f5412958783fd712e7a1542eaf
Parents: e90ac5f
Author: zhangduo zhang...@wandoujia.com
Authored: Sat Mar 21 18:15:23 2015 +0800
Committer: zhangduo zhang...@wandoujia.com
Committed: Sat Mar 21 20:55:49 2015 +0800

--
 .../TestEndToEndSplitTransaction.java   | 216 +--
 1 file changed, 102 insertions(+), 114 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/bbf9a90f/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java
--
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java
index d35c23e..cdcd0fc 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java
@@ -25,10 +25,10 @@ import static org.junit.Assert.assertTrue;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.NavigableMap;
 import java.util.Random;
 import java.util.Set;
+import java.util.TreeSet;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
@@ -38,6 +38,8 @@ import org.apache.hadoop.hbase.ChoreService;
 import org.apache.hadoop.hbase.HBaseTestingUtility;
 import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.HRegionInfo;
+import org.apache.hadoop.hbase.HRegionLocation;
+import org.apache.hadoop.hbase.MetaTableAccessor;
 import org.apache.hadoop.hbase.NotServingRegionException;
 import org.apache.hadoop.hbase.ScheduledChore;
 import org.apache.hadoop.hbase.ServerName;
@@ -47,8 +49,6 @@ import org.apache.hadoop.hbase.client.Admin;
 import org.apache.hadoop.hbase.client.Connection;
 import org.apache.hadoop.hbase.client.ConnectionFactory;
 import org.apache.hadoop.hbase.client.Get;
-import org.apache.hadoop.hbase.client.HConnection;
-import org.apache.hadoop.hbase.client.HConnectionManager;
 import org.apache.hadoop.hbase.client.HTable;
 import org.apache.hadoop.hbase.client.MetaScanner;
 import org.apache.hadoop.hbase.client.Put;
@@ -64,7 +64,6 @@ import 
org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanRequest;
 import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos;
 import org.apache.hadoop.hbase.testclassification.LargeTests;
 import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.hadoop.hbase.util.ConfigUtil;
 import org.apache.hadoop.hbase.util.Pair;
 import org.apache.hadoop.hbase.util.PairOfSameType;
 import org.apache.hadoop.hbase.util.StoppableImplementation;
@@ -82,7 +81,7 @@ import com.google.protobuf.ServiceException;
 public class TestEndToEndSplitTransaction {
   private static final Log LOG = 
LogFactory.getLog(TestEndToEndSplitTransaction.class);
   private static final HBaseTestingUtility TEST_UTIL = new 
HBaseTestingUtility();
-  private static final Configuration conf = TEST_UTIL.getConfiguration();
+  private static final Configuration CONF = TEST_UTIL.getConfiguration();
 
   @BeforeClass
   public static void beforeAllTests() throws Exception {
@@ -97,86 +96,81 @@ public class TestEndToEndSplitTransaction {
 
   @Test
   public void testMasterOpsWhileSplitting() throws Exception {
-TableName tableName =
-TableName.valueOf(TestSplit);
+TableName tableName = TableName.valueOf(TestSplit);
 byte[] familyName = Bytes.toBytes(fam);
 try (HTable ht = TEST_UTIL.createTable(tableName, familyName)) {
   TEST_UTIL.loadTable(ht, familyName, false);
 }
 HRegionServer server = TEST_UTIL.getHBaseCluster().getRegionServer(0);
-byte []firstRow = Bytes.toBytes(aaa);
-byte []splitRow = Bytes.toBytes(lll);
-byte []lastRow = Bytes.toBytes(zzz);
-HConnection con = HConnectionManager
-.getConnection(TEST_UTIL.getConfiguration());
-// this will also cache the region
-byte[] regionName = con.locateRegion(tableName, splitRow).getRegionInfo()
-.getRegionName();
-HRegion region = server.getRegion(regionName);
-SplitTransaction split = new SplitTransaction(region,