You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by jx...@apache.org on 2014/08/05 18:23:33 UTC
git commit: HBASE-11671 TestEndToEndSplitTransaction fails on master
(Mikhail Antonov)
Repository: hbase
Updated Branches:
refs/heads/master b158900b6 -> 074f83c80
HBASE-11671 TestEndToEndSplitTransaction fails on master (Mikhail Antonov)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/074f83c8
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/074f83c8
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/074f83c8
Branch: refs/heads/master
Commit: 074f83c80b2fcb400e4e7102a882a0bcb4536e7e
Parents: b158900
Author: Jimmy Xiang <jx...@cloudera.com>
Authored: Tue Aug 5 09:22:32 2014 -0700
Committer: Jimmy Xiang <jx...@cloudera.com>
Committed: Tue Aug 5 09:22:32 2014 -0700
----------------------------------------------------------------------
.../regionserver/TestEndToEndSplitTransaction.java | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/074f83c8/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 5cad147..8de605d 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
@@ -45,7 +45,6 @@ import org.apache.hadoop.hbase.ipc.PayloadCarryingRpcController;
import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.Stoppable;
import org.apache.hadoop.hbase.client.Get;
-import org.apache.hadoop.hbase.client.HBaseAdmin;
import org.apache.hadoop.hbase.client.HConnection;
import org.apache.hadoop.hbase.client.HConnectionManager;
import org.apache.hadoop.hbase.client.HTable;
@@ -58,6 +57,7 @@ import org.apache.hadoop.hbase.protobuf.ProtobufUtil;
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.util.Bytes;
import org.apache.hadoop.hbase.util.ConfigUtil;
import org.apache.hadoop.hbase.util.Pair;
@@ -126,7 +126,15 @@ public class TestEndToEndSplitTransaction {
// 3. finish phase II
// note that this replicates some code from SplitTransaction
// 2nd daughter first
- server.postOpenDeployTasks(regions.getSecond());
+ if (split.useZKForAssignment) {
+ server.postOpenDeployTasks(regions.getSecond());
+ } else {
+ server.reportRegionStateTransition(
+ RegionServerStatusProtos.RegionStateTransition.TransitionCode.SPLIT,
+ region.getRegionInfo(), regions.getFirst().getRegionInfo(),
+ regions.getSecond().getRegionInfo());
+ }
+
// Add to online regions
server.addToOnlineRegions(regions.getSecond());
// THIS is the crucial point:
@@ -136,7 +144,9 @@ public class TestEndToEndSplitTransaction {
assertTrue(test(con, tableName, lastRow, server));
// first daughter second
- server.postOpenDeployTasks(regions.getFirst());
+ if (split.useZKForAssignment) {
+ server.postOpenDeployTasks(regions.getFirst());
+ }
// Add to online regions
server.addToOnlineRegions(regions.getFirst());
assertTrue(test(con, tableName, firstRow, server));