You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2017/12/18 12:33:18 UTC
hbase git commit: HBASE-19546
TestMasterReplication.testCyclicReplication2 uses wrong assertion
Repository: hbase
Updated Branches:
refs/heads/master 2a5e5e9e2 -> 62b591bdc
HBASE-19546 TestMasterReplication.testCyclicReplication2 uses wrong assertion
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/62b591bd
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/62b591bd
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/62b591bd
Branch: refs/heads/master
Commit: 62b591bdc7388e0f1aed480665ba33f1128505b9
Parents: 2a5e5e9
Author: zhangduo <zh...@apache.org>
Authored: Mon Dec 18 16:38:10 2017 +0800
Committer: zhangduo <zh...@apache.org>
Committed: Mon Dec 18 19:59:14 2017 +0800
----------------------------------------------------------------------
.../replication/TestMasterReplication.java | 37 +++++++++-----------
1 file changed, 17 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/62b591bd/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestMasterReplication.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestMasterReplication.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestMasterReplication.java
index 08ad79c..f44c2ea 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestMasterReplication.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestMasterReplication.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -38,19 +38,18 @@ import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.ClusterStatus;
+import org.apache.hadoop.hbase.ClusterStatus.Option;
import org.apache.hadoop.hbase.HBaseConfiguration;
import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.HColumnDescriptor;
import org.apache.hadoop.hbase.HConstants;
-import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.KeyValue;
import org.apache.hadoop.hbase.MiniHBaseCluster;
import org.apache.hadoop.hbase.ServerLoad;
import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.Waiter;
-import org.apache.hadoop.hbase.ClusterStatus.Option;
import org.apache.hadoop.hbase.client.Admin;
+import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;
import org.apache.hadoop.hbase.client.ConnectionFactory;
import org.apache.hadoop.hbase.client.Delete;
import org.apache.hadoop.hbase.client.Durability;
@@ -58,6 +57,8 @@ import org.apache.hadoop.hbase.client.Get;
import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.client.Table;
+import org.apache.hadoop.hbase.client.TableDescriptor;
+import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
import org.apache.hadoop.hbase.client.replication.ReplicationPeerConfigUtil;
import org.apache.hadoop.hbase.coprocessor.CoprocessorHost;
import org.apache.hadoop.hbase.coprocessor.ObserverContext;
@@ -66,13 +67,13 @@ import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;
import org.apache.hadoop.hbase.coprocessor.RegionObserver;
import org.apache.hadoop.hbase.regionserver.HRegion;
import org.apache.hadoop.hbase.regionserver.wal.WALActionsListener;
-import org.apache.hadoop.hbase.wal.WALEdit;
import org.apache.hadoop.hbase.replication.regionserver.TestSourceFSConfigurationProvider;
import org.apache.hadoop.hbase.testclassification.LargeTests;
import org.apache.hadoop.hbase.testclassification.ReplicationTests;
import org.apache.hadoop.hbase.tool.LoadIncrementalHFiles;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.HFileTestUtil;
+import org.apache.hadoop.hbase.wal.WALEdit;
import org.apache.hadoop.hbase.zookeeper.MiniZooKeeperCluster;
import org.apache.hadoop.hbase.zookeeper.ZKUtil;
import org.apache.hadoop.hbase.zookeeper.ZKWatcher;
@@ -110,7 +111,7 @@ public class TestMasterReplication {
private static final byte[] put = Bytes.toBytes("put");
private static final byte[] delete = Bytes.toBytes("delete");
- private HTableDescriptor table;
+ private TableDescriptor table;
@Before
public void setUp() throws Exception {
@@ -130,16 +131,12 @@ public class TestMasterReplication {
baseConfiguration.setStrings(
CoprocessorHost.USER_REGION_COPROCESSOR_CONF_KEY,
CoprocessorCounter.class.getName());
-
- table = new HTableDescriptor(tableName);
- HColumnDescriptor fam = new HColumnDescriptor(famName);
- fam.setScope(HConstants.REPLICATION_SCOPE_GLOBAL);
- table.addFamily(fam);
- fam = new HColumnDescriptor(famName1);
- fam.setScope(HConstants.REPLICATION_SCOPE_GLOBAL);
- table.addFamily(fam);
- fam = new HColumnDescriptor(noRepfamName);
- table.addFamily(fam);
+ table = TableDescriptorBuilder.newBuilder(tableName)
+ .addColumnFamily(ColumnFamilyDescriptorBuilder.newBuilder(famName)
+ .setScope(HConstants.REPLICATION_SCOPE_GLOBAL).build())
+ .addColumnFamily(ColumnFamilyDescriptorBuilder.newBuilder(famName1)
+ .setScope(HConstants.REPLICATION_SCOPE_GLOBAL).build())
+ .addColumnFamily(ColumnFamilyDescriptorBuilder.of(noRepfamName)).build();
}
/**
@@ -273,7 +270,7 @@ public class TestMasterReplication {
*/
@Test(timeout = 300000)
public void testCyclicReplication2() throws Exception {
- LOG.info("testCyclicReplication1");
+ LOG.info("testCyclicReplication2");
int numClusters = 3;
Table[] htables = null;
try {
@@ -312,7 +309,7 @@ public class TestMasterReplication {
// without HBASE-9158 the edit for row4 would have been marked with
// cluster 0's id
// and hence not replicated to cluster 0
- wait(row4, htables[0], true);
+ wait(row4, htables[0], false);
} finally {
close(htables);
shutDownMiniClusters();
@@ -507,7 +504,7 @@ public class TestMasterReplication {
miniZK.shutdown();
}
- private void createTableOnClusters(HTableDescriptor table) throws Exception {
+ private void createTableOnClusters(TableDescriptor table) throws Exception {
for (HBaseTestingUtility utility : utilities) {
utility.getAdmin().createTable(table);
}
@@ -608,7 +605,7 @@ public class TestMasterReplication {
Path dir = util.getDataTestDirOnTestFS(testName);
FileSystem fs = util.getTestFileSystem();
- dir = dir.makeQualified(fs);
+ dir = dir.makeQualified(fs.getUri(), fs.getWorkingDirectory());
Path familyDir = new Path(dir, Bytes.toString(fam));
int hfileIdx = 0;