accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [50/50] [abbrv] git commit: ACCUMULO-378 Remove service port configuration in favor of random
Date Wed, 21 May 2014 02:00:09 GMT
ACCUMULO-378 Remove service port configuration in favor of random


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

Branch: refs/heads/ACCUMULO-378
Commit: 417b0b3328f7ad81bcde36a00e15091822f32b22
Parents: b53bbf0
Author: Josh Elser <elserj@apache.org>
Authored: Tue May 20 21:55:13 2014 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Tue May 20 21:55:13 2014 -0400

----------------------------------------------------------------------
 .../org/apache/accumulo/server/util/MasterMetadataUtil.java    | 1 -
 .../apache/accumulo/test/replication/CyclicReplicationIT.java  | 2 --
 .../org/apache/accumulo/test/replication/ReplicationIT.java    | 4 ----
 .../test/replication/ReplicationPortAdvertisementIT.java       | 2 --
 .../accumulo/test/replication/ReplicationSequentialIT.java     | 6 ------
 5 files changed, 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/417b0b33/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java
b/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java
index 05e1a0b..cecfceb 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java
@@ -309,7 +309,6 @@ public class MasterMetadataUtil {
     }
     if (unusedWalLogs != null) {
       for (String entry : unusedWalLogs) {
-        log.info("Removed WAL " + entry + " from " + extent, new Exception());
         m.putDelete(LogColumnFamily.NAME, new Text(entry));
       }
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/417b0b33/test/src/test/java/org/apache/accumulo/test/replication/CyclicReplicationIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/replication/CyclicReplicationIT.java
b/test/src/test/java/org/apache/accumulo/test/replication/CyclicReplicationIT.java
index b30dc39..032e519 100644
--- a/test/src/test/java/org/apache/accumulo/test/replication/CyclicReplicationIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/replication/CyclicReplicationIT.java
@@ -105,8 +105,6 @@ public class CyclicReplicationIT {
     master2Cfg.setInstanceName("master2");
     master2Cfg.setProperty(Property.REPLICATION_NAME, master2Cfg.getInstanceName());
     master2Cfg.setProperty(Property.TSERV_WALOG_MAX_SIZE, "5M");
-    master2Cfg.setProperty(Property.MASTER_REPLICATION_COORDINATOR_PORT, "10003");
-    master2Cfg.setProperty(Property.REPLICATION_RECEIPT_SERVICE_PORT, "10004");
     master2Cfg.setProperty(Property.REPLICATION_THREADCHECK, "5m");
     master2Cfg.setProperty(Property.REPLICATION_WORK_ASSIGNMENT_SLEEP, "1s");
     master2Cfg.setProperty(Property.MASTER_REPLICATION_SCAN_INTERVAL, "1s");

http://git-wip-us.apache.org/repos/asf/accumulo/blob/417b0b33/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 91f3581..77dcceb 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
@@ -74,8 +74,6 @@ public class ReplicationIT extends ConfigurableMacIT {
     peerCfg.setNumTservers(1);
     peerCfg.setInstanceName("peer");
     peerCfg.setProperty(Property.TSERV_WALOG_MAX_SIZE, "5M");
-    peerCfg.setProperty(Property.MASTER_REPLICATION_COORDINATOR_PORT, "10003");
-    peerCfg.setProperty(Property.REPLICATION_RECEIPT_SERVICE_PORT, "10004");
     peerCfg.setProperty(Property.REPLICATION_WORK_ASSIGNMENT_SLEEP, "1s");
     peerCfg.setProperty(Property.MASTER_REPLICATION_SCAN_INTERVAL, "1s");
     peerCfg.setProperty(Property.REPLICATION_NAME, "peer");
@@ -162,8 +160,6 @@ public class ReplicationIT extends ConfigurableMacIT {
     peerCfg.setNumTservers(1);
     peerCfg.setInstanceName("peer");
     peerCfg.setProperty(Property.TSERV_WALOG_MAX_SIZE, "5M");
-    peerCfg.setProperty(Property.MASTER_REPLICATION_COORDINATOR_PORT, "10003");
-    peerCfg.setProperty(Property.REPLICATION_RECEIPT_SERVICE_PORT, "10004");
     peerCfg.setProperty(Property.REPLICATION_WORK_ASSIGNMENT_SLEEP, "1s");
     peerCfg.setProperty(Property.MASTER_REPLICATION_SCAN_INTERVAL, "1s");
     peerCfg.setProperty(Property.REPLICATION_NAME, "peer");

http://git-wip-us.apache.org/repos/asf/accumulo/blob/417b0b33/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 a13ca70..4254154 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
@@ -48,8 +48,6 @@ public class ReplicationPortAdvertisementIT extends ConfigurableMacIT {
   @Override
   public void configure(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) {
     cfg.setNumTservers(2);
-    cfg.setProperty(Property.REPLICATION_RECEIPT_SERVICE_PORT, "0");
-    cfg.setProperty(Property.MASTER_REPLICATION_COORDINATOR_PORT, "0");
   }
   
   @Test

http://git-wip-us.apache.org/repos/asf/accumulo/blob/417b0b33/test/src/test/java/org/apache/accumulo/test/replication/ReplicationSequentialIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/replication/ReplicationSequentialIT.java
b/test/src/test/java/org/apache/accumulo/test/replication/ReplicationSequentialIT.java
index 296175b..2420ac6 100644
--- a/test/src/test/java/org/apache/accumulo/test/replication/ReplicationSequentialIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/replication/ReplicationSequentialIT.java
@@ -84,8 +84,6 @@ public class ReplicationSequentialIT extends ConfigurableMacIT {
     cfg.setProperty(Property.GC_CYCLE_DELAY, "5s");
     cfg.setProperty(Property.REPLICATION_WORK_ASSIGNMENT_SLEEP, "1s");
     cfg.setProperty(Property.MASTER_REPLICATION_SCAN_INTERVAL, "1s");
-    cfg.setProperty(Property.MASTER_REPLICATION_COORDINATOR_PORT, "0");
-    cfg.setProperty(Property.REPLICATION_RECEIPT_SERVICE_PORT, "0");
     cfg.setProperty(Property.REPLICATION_MAX_UNIT_SIZE, "8M");
     cfg.setProperty(Property.REPLICATION_NAME, "master");
     cfg.setProperty(Property.REPLICATION_WORK_ASSIGNER, SequentialWorkAssigner.class.getName());
@@ -99,8 +97,6 @@ public class ReplicationSequentialIT extends ConfigurableMacIT {
     peerCfg.setNumTservers(1);
     peerCfg.setInstanceName("peer");
     peerCfg.setProperty(Property.TSERV_WALOG_MAX_SIZE, "5M");
-    peerCfg.setProperty(Property.MASTER_REPLICATION_COORDINATOR_PORT, "0");
-    peerCfg.setProperty(Property.REPLICATION_RECEIPT_SERVICE_PORT, "0");
     peerCfg.setProperty(Property.REPLICATION_WORK_ASSIGNMENT_SLEEP, "1s");
     peerCfg.setProperty(Property.MASTER_REPLICATION_SCAN_INTERVAL, "1s");
     peerCfg.setProperty(Property.REPLICATION_NAME, "peer");
@@ -251,8 +247,6 @@ public class ReplicationSequentialIT extends ConfigurableMacIT {
     peerCfg.setNumTservers(1);
     peerCfg.setInstanceName("peer");
     peerCfg.setProperty(Property.TSERV_WALOG_MAX_SIZE, "5M");
-    peerCfg.setProperty(Property.MASTER_REPLICATION_COORDINATOR_PORT, "0");
-    peerCfg.setProperty(Property.REPLICATION_RECEIPT_SERVICE_PORT, "0");
     peerCfg.setProperty(Property.REPLICATION_WORK_ASSIGNMENT_SLEEP, "1s");
     peerCfg.setProperty(Property.MASTER_REPLICATION_SCAN_INTERVAL, "1s");
     peerCfg.setProperty(Property.REPLICATION_NAME, "peer");


Mime
View raw message