http://git-wip-us.apache.org/repos/asf/accumulo/blob/178ffe97/test/src/test/java/org/apache/accumulo/test/replication/ReplicationPortAdvertisementIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/replication/ReplicationPortAdvertisementIT.java b/test/src/test/java/org/apache/accumulo/test/replication/ReplicationPortAdvertisementIT.java index 4254154..f879895 100644 --- a/test/src/test/java/org/apache/accumulo/test/replication/ReplicationPortAdvertisementIT.java +++ b/test/src/test/java/org/apache/accumulo/test/replication/ReplicationPortAdvertisementIT.java @@ -49,7 +49,7 @@ public class ReplicationPortAdvertisementIT extends ConfigurableMacIT { public void configure(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) { cfg.setNumTservers(2); } - + @Test public void tserverReplicationServicePortsAreAdvertised() throws Exception { // Wait for the cluster to be up @@ -81,7 +81,7 @@ public class ReplicationPortAdvertisementIT extends ConfigurableMacIT { // Each tserver should also have equial replicaiton services running internally Assert.assertEquals("Expected an equal number of replication servicers and tservers", tserverHost.size(), replicationServices.size()); } - + @Test public void masterReplicationServicePortsAreAdvertised() throws Exception { // Wait for the cluster to be up
http://git-wip-us.apache.org/repos/asf/accumulo/blob/178ffe97/test/src/test/java/org/apache/accumulo/test/replication/ReplicationSourceOnlyIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/replication/ReplicationSourceOnlyIT.java b/test/src/test/java/org/apache/accumulo/test/replication/ReplicationSourceOnlyIT.java index 81ae5ca..62c09f5 100644 --- a/test/src/test/java/org/apache/accumulo/test/replication/ReplicationSourceOnlyIT.java +++ b/test/src/test/java/org/apache/accumulo/test/replication/ReplicationSourceOnlyIT.java @@ -110,7 +110,7 @@ public class ReplicationSourceOnlyIT extends ConfigurableMacIT { } } } - + }); t.start(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/178ffe97/test/src/test/java/org/apache/accumulo/test/replication/ReplicationTablesMacTest.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/replication/ReplicationTablesMacTest.java b/test/src/test/java/org/apache/accumulo/test/replication/ReplicationTablesMacTest.java index 00524b8..da874fa 100644 --- a/test/src/test/java/org/apache/accumulo/test/replication/ReplicationTablesMacTest.java +++ b/test/src/test/java/org/apache/accumulo/test/replication/ReplicationTablesMacTest.java @@ -16,15 +16,11 @@ */ package org.apache.accumulo.test.replication; -import java.util.Map.Entry; - import org.apache.accumulo.core.client.BatchWriter; import org.apache.accumulo.core.client.BatchWriterConfig; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.Scanner; -import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.Mutation; -import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.metadata.MetadataTable; import org.apache.accumulo.core.metadata.schema.MetadataSchema.ReplicationSection; import org.apache.accumulo.core.protobuf.ProtobufUtil; http://git-wip-us.apache.org/repos/asf/accumulo/blob/178ffe97/test/src/test/java/org/apache/accumulo/test/replication/ReplicationTest.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/replication/ReplicationTest.java b/test/src/test/java/org/apache/accumulo/test/replication/ReplicationTest.java index 90bfabf..7146019 100644 --- a/test/src/test/java/org/apache/accumulo/test/replication/ReplicationTest.java +++ b/test/src/test/java/org/apache/accumulo/test/replication/ReplicationTest.java @@ -105,14 +105,14 @@ public class ReplicationTest extends ConfigurableMacIT { StatusSection.limit(scanner); for (Entry<Key,Value> entry : scanner) { Key k = entry.getKey(); - + String fileUri = k.getRow().toString(); try { new URI(fileUri); } catch (URISyntaxException e) { Assert.fail("Expected a valid URI: " + fileUri); } - + replRows.add(fileUri); } } @@ -257,7 +257,8 @@ public class ReplicationTest extends ConfigurableMacIT { Assert.assertTrue(iter.hasNext()); Entry<Key,Value> entry = iter.next(); // We should at least find one status record for this table, we might find a second if another log was started from ingesting the data - Assert.assertEquals("Expected to find replication entry for " + table1, conn.tableOperations().tableIdMap().get(table1), entry.getKey().getColumnQualifier().toString()); + Assert.assertEquals("Expected to find replication entry for " + table1, conn.tableOperations().tableIdMap().get(table1), entry.getKey() + .getColumnQualifier().toString()); s.close(); // Enable replication on table2 http://git-wip-us.apache.org/repos/asf/accumulo/blob/178ffe97/test/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/test/src/test/resources/log4j.properties b/test/src/test/resources/log4j.properties index 5566a3b..031b685 100644 --- a/test/src/test/resources/log4j.properties +++ b/test/src/test/resources/log4j.properties @@ -35,7 +35,6 @@ log4j.logger.org.apache.accumulo.core.file.rfile.bcfile=INFO log4j.logger.org.apache.accumulo.server.util.ReplicationTableUtil=TRACE log4j.logger.org.apache.accumulo.core.client.impl.TabletServerBatchReaderIterator=INFO log4j.logger.org.apache.accumulo.core.client.impl.ThriftScanner=INFO -#log4j.logger.org.apache.accumulo.server.zookeeper.DistributedWorkQueue=INFO log4j.logger.org.apache.accumulo.fate.zookeeper.DistributedReadWriteLock=WARN log4j.logger.org.mortbay.log=WARN log4j.logger.org.apache.hadoop=WARN
