[accumulo] branch 1451-external-compactions-feature updated: ref #2028 - modify checks to account for compactions that start after split, remove unused property

[dlmarion]

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 f8b906f  ref #2028 - modify checks to account for compactions that 
start after split, remove unused property
f8b906f is described below

commit f8b906f92dd1a4dbedb5dea374e89f5d936bf4fd
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Wed Apr 28 12:48:17 2021 +0000

    ref #2028 - modify checks to account for compactions that start after 
split, remove unused property
---
 core/src/main/java/org/apache/accumulo/core/conf/Property.java        | 2 --
 test/src/main/java/org/apache/accumulo/test/ExternalCompactionIT.java | 4 ++--
 .../main/java/org/apache/accumulo/test/TestCompactionCoordinator.java | 4 +---
 3 files changed, 3 insertions(+), 7 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 aff4398..2cc6b23 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
@@ -1044,8 +1044,6 @@ public enum Property {
       "if the ports above are in use, search higher ports until one is 
available"),
   COORDINATOR_CLIENTPORT("coordinator.port.client", "9100", PropertyType.PORT,
       "The port used for handling Thrift client connections on the compaction 
coordinator server"),
-  COORDINATOR_METRICPORT("coordinator.port.metrics", "9099", PropertyType.PORT,
-      "The port used for the metric http server on the compaction coordinator 
server"),
   COORDINATOR_MINTHREADS("coordinator.server.threads.minimum", "1", 
PropertyType.COUNT,
       "The minimum number of threads to use to handle incoming requests."),
   COORDINATOR_MINTHREADS_TIMEOUT("coordinator.server.threads.timeout", "0s",
diff --git 
a/test/src/main/java/org/apache/accumulo/test/ExternalCompactionIT.java 
b/test/src/main/java/org/apache/accumulo/test/ExternalCompactionIT.java
index fc2ef28..ac7b95b 100644
--- a/test/src/main/java/org/apache/accumulo/test/ExternalCompactionIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ExternalCompactionIT.java
@@ -225,8 +225,8 @@ public class ExternalCompactionIT extends 
ConfigurableMacBase {
       }
 
       // Check that there is one failed compaction in the coordinator metrics
-      assertEquals(1, metrics.getStarted());
-      assertEquals(1, metrics.getRunning()); // CBUG: Should be zero when 
#2032 is resolved
+      assertTrue(metrics.getStarted() > 0);
+      assertTrue(metrics.getRunning() > 0); // CBUG: Should be zero when #2032 
is resolved
       assertEquals(0, metrics.getCompleted());
       assertEquals(1, metrics.getFailed());
 
diff --git 
a/test/src/main/java/org/apache/accumulo/test/TestCompactionCoordinator.java 
b/test/src/main/java/org/apache/accumulo/test/TestCompactionCoordinator.java
index 0d3e708..e5f3175 100644
--- a/test/src/main/java/org/apache/accumulo/test/TestCompactionCoordinator.java
+++ b/test/src/main/java/org/apache/accumulo/test/TestCompactionCoordinator.java
@@ -27,7 +27,6 @@ import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.accumulo.coordinator.CompactionCoordinator;
 import org.apache.accumulo.coordinator.ExternalCompactionMetrics;
-import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.dataImpl.thrift.TKeyExtent;
 import org.apache.accumulo.core.securityImpl.thrift.TCredentials;
 import org.apache.accumulo.core.tabletserver.thrift.TCompactionStats;
@@ -62,8 +61,7 @@ public class TestCompactionCoordinator extends 
CompactionCoordinator
   }
 
   private Server startHttpMetricServer() throws Exception {
-    int port = 
getContext().getConfiguration().getPortStream(Property.COORDINATOR_METRICPORT)
-        .iterator().next();
+    int port = 9099;
     String hostname = getHostname();
     Server metricServer = new Server(new QueuedThreadPool(4, 1));
     ServerConnector c = new ServerConnector(metricServer);