Repository: accumulo Updated Branches: refs/heads/master 5aff1fb7b -> 34ca056b3
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f1a47b38/server/master/src/test/java/org/apache/accumulo/master/replication/UnorderedWorkAssignerTest.java ---------------------------------------------------------------------- diff --git a/server/master/src/test/java/org/apache/accumulo/master/replication/UnorderedWorkAssignerTest.java b/server/master/src/test/java/org/apache/accumulo/master/replication/UnorderedWorkAssignerTest.java index 2199808..5d69216 100644 --- a/server/master/src/test/java/org/apache/accumulo/master/replication/UnorderedWorkAssignerTest.java +++ b/server/master/src/test/java/org/apache/accumulo/master/replication/UnorderedWorkAssignerTest.java @@ -41,13 +41,14 @@ import org.apache.accumulo.core.protobuf.ProtobufUtil; import org.apache.accumulo.core.replication.ReplicationConstants; import org.apache.accumulo.core.replication.ReplicationSchema.OrderSection; import org.apache.accumulo.core.replication.ReplicationSchema.WorkSection; +import org.apache.accumulo.core.replication.ReplicationTable; import org.apache.accumulo.core.replication.ReplicationTarget; import org.apache.accumulo.core.replication.StatusUtil; import org.apache.accumulo.core.replication.proto.Replication.Status; import org.apache.accumulo.core.security.Credentials; import org.apache.accumulo.core.security.TablePermission; import org.apache.accumulo.server.replication.DistributedWorkQueueWorkAssignerHelper; -import org.apache.accumulo.server.replication.ReplicationTable; +import org.apache.accumulo.server.replication.ReplicationUtil; import org.apache.accumulo.server.zookeeper.DistributedWorkQueue; import org.apache.accumulo.server.zookeeper.ZooCache; import org.apache.hadoop.fs.Path; @@ -85,9 +86,10 @@ public class UnorderedWorkAssignerTest { Path p = new Path("/accumulo/wal/tserver+port/" + UUID.randomUUID()); - String expectedQueueKey = p.getName() + DistributedWorkQueueWorkAssignerHelper.KEY_SEPARATOR + target.getPeerName() + DistributedWorkQueueWorkAssignerHelper.KEY_SEPARATOR - + target.getRemoteIdentifier() + DistributedWorkQueueWorkAssignerHelper.KEY_SEPARATOR + target.getSourceTableId(); - + String expectedQueueKey = p.getName() + DistributedWorkQueueWorkAssignerHelper.KEY_SEPARATOR + target.getPeerName() + + DistributedWorkQueueWorkAssignerHelper.KEY_SEPARATOR + target.getRemoteIdentifier() + DistributedWorkQueueWorkAssignerHelper.KEY_SEPARATOR + + target.getSourceTableId(); + workQueue.addWork(expectedQueueKey, p.toString()); expectLastCall().once(); @@ -135,7 +137,7 @@ public class UnorderedWorkAssignerTest { assigner.setConnector(conn); // Create and grant ourselves write to the replication table - ReplicationTable.create(conn); + ReplicationUtil.createReplicationTable(conn); conn.securityOperations().grantTablePermission("root", ReplicationTable.NAME, TablePermission.WRITE); Status.Builder builder = Status.newBuilder().setBegin(0).setEnd(0).setInfiniteEnd(true).setClosed(false).setCreatedTime(5l); @@ -198,7 +200,7 @@ public class UnorderedWorkAssignerTest { assigner.setConnector(conn); // Create and grant ourselves write to the replication table - ReplicationTable.create(conn); + ReplicationUtil.createReplicationTable(conn); conn.securityOperations().grantTablePermission("root", ReplicationTable.NAME, TablePermission.WRITE); // Create two mutations, both of which need replication work done @@ -270,7 +272,7 @@ public class UnorderedWorkAssignerTest { assigner.setConnector(conn); // Create and grant ourselves write to the replication table - ReplicationTable.create(conn); + ReplicationUtil.createReplicationTable(conn); conn.securityOperations().grantTablePermission("root", ReplicationTable.NAME, TablePermission.WRITE); // Create two mutations, both of which need replication work done http://git-wip-us.apache.org/repos/asf/accumulo/blob/f1a47b38/server/master/src/test/java/org/apache/accumulo/master/replication/WorkMakerTest.java ---------------------------------------------------------------------- diff --git a/server/master/src/test/java/org/apache/accumulo/master/replication/WorkMakerTest.java b/server/master/src/test/java/org/apache/accumulo/master/replication/WorkMakerTest.java index d486ded..280ca82 100644 --- a/server/master/src/test/java/org/apache/accumulo/master/replication/WorkMakerTest.java +++ b/server/master/src/test/java/org/apache/accumulo/master/replication/WorkMakerTest.java @@ -33,11 +33,11 @@ import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.replication.ReplicationSchema.StatusSection; import org.apache.accumulo.core.replication.ReplicationSchema.WorkSection; +import org.apache.accumulo.core.replication.ReplicationTable; import org.apache.accumulo.core.replication.ReplicationTarget; import org.apache.accumulo.core.replication.StatusUtil; import org.apache.accumulo.core.replication.proto.Replication.Status; import org.apache.accumulo.server.conf.TableConfiguration; -import org.apache.accumulo.server.replication.ReplicationTable; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.Text; import org.junit.Assert; http://git-wip-us.apache.org/repos/asf/accumulo/blob/f1a47b38/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ReplicationServlet.java ---------------------------------------------------------------------- diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ReplicationServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ReplicationServlet.java index 1cb6abf..4c21c39 100644 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ReplicationServlet.java +++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ReplicationServlet.java @@ -28,6 +28,7 @@ import org.apache.accumulo.core.client.Instance; import org.apache.accumulo.core.client.admin.TableOperations; import org.apache.accumulo.core.master.thrift.MasterMonitorInfo; import org.apache.accumulo.core.replication.ReplicationConstants; +import org.apache.accumulo.core.replication.ReplicationTable; import org.apache.accumulo.core.replication.ReplicationTarget; import org.apache.accumulo.core.security.Credentials; import org.apache.accumulo.core.zookeeper.ZooUtil; @@ -75,7 +76,7 @@ public class ReplicationServlet extends BasicServlet { int totalWorkQueueSize = replicationUtil.getMaxReplicationThreads(systemProps, mmi); TableOperations tops = conn.tableOperations(); - if (!tops.exists(ReplicationConstants.TABLE_NAME)) { + if (!tops.exists(ReplicationTable.NAME)) { banner(sb, "", "Replication table does not yet exist"); return; } http://git-wip-us.apache.org/repos/asf/accumulo/blob/f1a47b38/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/ReplicationProcessor.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/ReplicationProcessor.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/ReplicationProcessor.java index 4b57813..1843acb 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/ReplicationProcessor.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/ReplicationProcessor.java @@ -35,6 +35,7 @@ import org.apache.accumulo.core.data.Range; import org.apache.accumulo.core.protobuf.ProtobufUtil; import org.apache.accumulo.core.replication.ReplicaSystemHelper; import org.apache.accumulo.core.replication.ReplicationSchema.WorkSection; +import org.apache.accumulo.core.replication.ReplicationTable; import org.apache.accumulo.core.replication.ReplicationTarget; import org.apache.accumulo.core.replication.StatusUtil; import org.apache.accumulo.core.replication.proto.Replication.Status; @@ -42,7 +43,6 @@ import org.apache.accumulo.core.security.Credentials; import org.apache.accumulo.server.conf.ServerConfigurationFactory; import org.apache.accumulo.server.fs.VolumeManager; import org.apache.accumulo.server.replication.DistributedWorkQueueWorkAssignerHelper; -import org.apache.accumulo.server.replication.ReplicationTable; import org.apache.accumulo.server.zookeeper.DistributedWorkQueue.Processor; import org.apache.hadoop.fs.Path; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/accumulo/blob/f1a47b38/test/src/test/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java b/test/src/test/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java index 9e571cd..0000e7f 100644 --- a/test/src/test/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java +++ b/test/src/test/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java @@ -43,6 +43,7 @@ import org.apache.accumulo.core.metadata.MetadataTable; import org.apache.accumulo.core.metadata.schema.MetadataSchema.ReplicationSection; import org.apache.accumulo.core.protobuf.ProtobufUtil; import org.apache.accumulo.core.replication.ReplicationSchema.WorkSection; +import org.apache.accumulo.core.replication.ReplicationTable; import org.apache.accumulo.core.replication.StatusUtil; import org.apache.accumulo.core.replication.proto.Replication.Status; import org.apache.accumulo.core.security.Authorizations; @@ -53,7 +54,7 @@ import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.minicluster.impl.MiniAccumuloClusterImpl; import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.apache.accumulo.minicluster.impl.ProcessReference; -import org.apache.accumulo.server.replication.ReplicationTable; +import org.apache.accumulo.server.replication.ReplicationUtil; import org.apache.accumulo.test.functional.ConfigurableMacIT; import org.apache.accumulo.tserver.TabletServer; import org.apache.accumulo.tserver.replication.AccumuloReplicaSystem; @@ -163,7 +164,7 @@ public class MultiInstanceReplicationIT extends ConfigurableMacIT { final Connector connMaster = getConnector(); final Connector connPeer = peerCluster.getConnector("root", ROOT_PASSWORD); - ReplicationTable.create(connMaster); + ReplicationUtil.createReplicationTable(connMaster); String peerUserName = "peer", peerPassword = "foo"; @@ -640,7 +641,6 @@ public class MultiInstanceReplicationIT extends ConfigurableMacIT { Thread.sleep(500); } - for (ProcessReference proc : cluster.getProcesses().get(ServerType.TABLET_SERVER)) { cluster.killProcess(ServerType.TABLET_SERVER, proc); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/f1a47b38/test/src/test/java/org/apache/accumulo/test/replication/ReplicationIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/replication/ReplicationIT.java b/test/src/test/java/org/apache/accumulo/test/replication/ReplicationIT.java index fb96d7f..69cd195 100644 --- a/test/src/test/java/org/apache/accumulo/test/replication/ReplicationIT.java +++ b/test/src/test/java/org/apache/accumulo/test/replication/ReplicationIT.java @@ -49,6 +49,7 @@ import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.Lo import org.apache.accumulo.core.protobuf.ProtobufUtil; import org.apache.accumulo.core.replication.ReplicationSchema.StatusSection; import org.apache.accumulo.core.replication.ReplicationSchema.WorkSection; +import org.apache.accumulo.core.replication.ReplicationTable; import org.apache.accumulo.core.replication.ReplicationTarget; import org.apache.accumulo.core.replication.StatusUtil; import org.apache.accumulo.core.replication.proto.Replication.Status; @@ -60,7 +61,7 @@ import org.apache.accumulo.gc.SimpleGarbageCollector; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.apache.accumulo.minicluster.impl.ProcessReference; -import org.apache.accumulo.server.replication.ReplicationTable; +import org.apache.accumulo.server.replication.ReplicationUtil; import org.apache.accumulo.server.util.ReplicationTableUtil; import org.apache.accumulo.test.functional.ConfigurableMacIT; import org.apache.accumulo.tserver.TabletServer; @@ -81,9 +82,8 @@ import com.google.common.collect.Sets; import com.google.protobuf.TextFormat; /** - * Replication tests which verify expected functionality using a single MAC instance. A MockReplicaSystem - * is used to "fake" the peer instance that we're replicating to. This lets us test replication in a functional - * way without having to worry about two real systems. + * Replication tests which verify expected functionality using a single MAC instance. A MockReplicaSystem is used to "fake" the peer instance that we're + * replicating to. This lets us test replication in a functional way without having to worry about two real systems. */ public class ReplicationIT extends ConfigurableMacIT { private static final Logger log = LoggerFactory.getLogger(ReplicationIT.class); @@ -311,7 +311,7 @@ public class ReplicationIT extends ConfigurableMacIT { conn.securityOperations().grantTablePermission("root", ReplicationTable.NAME, TablePermission.READ); // Verify that we found a single replication record that's for table1 - Scanner s = ReplicationTable.getScanner(conn, new Authorizations()); + Scanner s = ReplicationTable.getScanner(conn); StatusSection.limit(s); Iterator<Entry<Key,Value>> iter = s.iterator(); attempts = 5; @@ -319,7 +319,7 @@ public class ReplicationIT extends ConfigurableMacIT { if (!iter.hasNext()) { s.close(); Thread.sleep(1000); - s = ReplicationTable.getScanner(conn, new Authorizations()); + s = ReplicationTable.getScanner(conn); iter = s.iterator(); attempts--; } else { @@ -384,7 +384,7 @@ public class ReplicationIT extends ConfigurableMacIT { Thread.sleep(5000); // Verify that we found two replication records: one for table1 and one for table2 - s = ReplicationTable.getScanner(conn, new Authorizations()); + s = ReplicationTable.getScanner(conn); StatusSection.limit(s); iter = s.iterator(); Assert.assertTrue("Found no records in replication table", iter.hasNext()); @@ -562,7 +562,7 @@ public class ReplicationIT extends ConfigurableMacIT { conn.tableOperations().delete(ReplicationTable.NAME); } - ReplicationTable.create(conn); + ReplicationUtil.createReplicationTable(conn); conn.securityOperations().grantTablePermission("root", ReplicationTable.NAME, TablePermission.WRITE); final AtomicBoolean keepRunning = new AtomicBoolean(true); @@ -1063,7 +1063,7 @@ public class ReplicationIT extends ConfigurableMacIT { conn.tableOperations().delete(ReplicationTable.NAME); } - ReplicationTable.create(conn); + ReplicationUtil.createReplicationTable(conn); conn.securityOperations().grantTablePermission("root", ReplicationTable.NAME, TablePermission.WRITE); final AtomicBoolean keepRunning = new AtomicBoolean(true); http://git-wip-us.apache.org/repos/asf/accumulo/blob/f1a47b38/test/src/test/java/org/apache/accumulo/test/replication/StatusCombinerMacTest.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/replication/StatusCombinerMacTest.java b/test/src/test/java/org/apache/accumulo/test/replication/StatusCombinerMacTest.java index 396df20..ff64d0b 100644 --- a/test/src/test/java/org/apache/accumulo/test/replication/StatusCombinerMacTest.java +++ b/test/src/test/java/org/apache/accumulo/test/replication/StatusCombinerMacTest.java @@ -35,10 +35,11 @@ import org.apache.accumulo.core.metadata.MetadataTable; import org.apache.accumulo.core.metadata.schema.MetadataSchema; import org.apache.accumulo.core.protobuf.ProtobufUtil; import org.apache.accumulo.core.replication.ReplicationSchema.StatusSection; +import org.apache.accumulo.core.replication.ReplicationTable; import org.apache.accumulo.core.replication.StatusUtil; import org.apache.accumulo.core.replication.proto.Replication.Status; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.server.replication.ReplicationTable; +import org.apache.accumulo.server.replication.ReplicationUtil; import org.apache.accumulo.server.util.ReplicationTableUtil; import org.apache.accumulo.test.functional.SimpleMacIT; import org.apache.hadoop.io.Text; @@ -84,7 +85,7 @@ public class StatusCombinerMacTest extends SimpleMacIT { conn.tableOperations().delete(ReplicationTable.NAME); } - ReplicationTable.create(conn); + ReplicationUtil.createReplicationTable(conn); BatchWriter bw = conn.createBatchWriter(ReplicationTable.NAME, new BatchWriterConfig()); long createTime = System.currentTimeMillis(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/f1a47b38/test/src/test/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java b/test/src/test/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java index a4d6179..edd49ab 100644 --- a/test/src/test/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java +++ b/test/src/test/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java @@ -43,6 +43,7 @@ import org.apache.accumulo.core.metadata.MetadataTable; import org.apache.accumulo.core.metadata.schema.MetadataSchema.ReplicationSection; import org.apache.accumulo.core.protobuf.ProtobufUtil; import org.apache.accumulo.core.replication.ReplicationSchema.WorkSection; +import org.apache.accumulo.core.replication.ReplicationTable; import org.apache.accumulo.core.replication.StatusUtil; import org.apache.accumulo.core.replication.proto.Replication.Status; import org.apache.accumulo.core.security.Authorizations; @@ -53,7 +54,7 @@ import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.minicluster.impl.MiniAccumuloClusterImpl; import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.apache.accumulo.minicluster.impl.ProcessReference; -import org.apache.accumulo.server.replication.ReplicationTable; +import org.apache.accumulo.server.replication.ReplicationUtil; import org.apache.accumulo.test.functional.ConfigurableMacIT; import org.apache.accumulo.tserver.TabletServer; import org.apache.accumulo.tserver.replication.AccumuloReplicaSystem; @@ -167,7 +168,7 @@ public class UnorderedWorkAssignerReplicationIT extends ConfigurableMacIT { final Connector connMaster = getConnector(); final Connector connPeer = peerCluster.getConnector("root", ROOT_PASSWORD); - ReplicationTable.create(connMaster); + ReplicationUtil.createReplicationTable(connMaster); String peerUserName = "peer", peerPassword = "foo"; @@ -703,7 +704,7 @@ public class UnorderedWorkAssignerReplicationIT extends ConfigurableMacIT { Assert.assertTrue("Did not find any records in " + peerTable1 + " on peer", countTable > 0); - for (int i = 0; i < 10; i++ ) { + for (int i = 0; i < 10; i++) { countTable = 0l; for (Entry<Key,Value> entry : connPeer.createScanner(peerTable2, Authorizations.EMPTY)) { countTable++;
