[accumulo] branch 1451-external-compactions-feature updated: Modify compactor port search property default to true to enable multiple compactors running locally

[dl...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dlmarion pushed a commit to branch 1451-external-compactions-feature
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/1451-external-compactions-feature by this push:
     new ccf4776  Modify compactor port search property default to true to enable multiple compactors running locally
ccf4776 is described below

commit ccf47760b80d939f47d10ea4e214ac04cb3a3b7b
Author: Dave Marion <dl...@apache.org>
AuthorDate: Mon Mar 15 16:01:54 2021 +0000

    Modify compactor port search property default to true to enable multiple compactors running locally
---
 core/src/main/java/org/apache/accumulo/core/conf/Property.java        | 4 ++--
 .../java/org/apache/accumulo/coordinator/CompactionCoordinator.java   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/apache/accumulo/core/conf/Property.java b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
index cf80270..3f77de6 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@ -1027,8 +1027,8 @@ public enum Property {
   // Compactor properties
   COMPACTOR_PREFIX("compactor.", null, PropertyType.PREFIX,
       "Properties in this category affect the behavior of the accumulo compactor server."),
-  COMPACTOR_PORTSEARCH("compactor.port.search", "false", PropertyType.BOOLEAN,
-      "if the ports above are in use, search higher ports until one is available"),
+  COMPACTOR_PORTSEARCH("compactor.port.search", "true", PropertyType.BOOLEAN,
+      "if the compactor.port.client is in use, search higher ports until one is available"),
   COMPACTOR_CLIENTPORT("compactor.port.client", "9100", PropertyType.PORT,
       "The port used for handling client connections on the compactor servers"),
   COMPACTOR_MINTHREADS("compactor.server.threads.minimum", "1", PropertyType.COUNT,
diff --git a/server/compaction-coordinator/src/main/java/org/apache/accumulo/coordinator/CompactionCoordinator.java b/server/compaction-coordinator/src/main/java/org/apache/accumulo/coordinator/CompactionCoordinator.java
index 9716258..0a066b9 100644
--- a/server/compaction-coordinator/src/main/java/org/apache/accumulo/coordinator/CompactionCoordinator.java
+++ b/server/compaction-coordinator/src/main/java/org/apache/accumulo/coordinator/CompactionCoordinator.java
@@ -273,6 +273,7 @@ public class CompactionCoordinator extends AbstractServer
     String queue = queueName.intern();
     TServerInstance tserver = null;
     Long priority = null;
+    // CBUG Review synchronization on QUEUES
     synchronized (QUEUES) {
       TreeMap<Long,LinkedHashSet<TServerInstance>> m = QUEUES.get(queue);
       if (null != m) {