removed unused compaction properties

Changes in how compactions work left three compaction properites unused and this change removes them.
keith-turner · Sep 28, 2024 · 31b3e5e · 31b3e5e
1 parent 35189b2
commit 31b3e5e
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 28 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
@@ -1150,22 +1150,7 @@ public enum Property {
   @Experimental
   COMPACTION_COORDINATOR_DEAD_COMPACTOR_CHECK_INTERVAL(
       "compaction.coordinator.compactor.dead.check.interval", "5m", PropertyType.TIMEDURATION,
-      "The interval at which to check for dead compactors.", "2.1.0"),
-  @Experimental
-  COMPACTION_COORDINATOR_FINALIZER_TSERVER_NOTIFIER_MAXTHREADS(
-      "compaction.coordinator.compaction.finalizer.threads.maximum", "5", PropertyType.COUNT,
-      "The maximum number of threads to use for notifying tablet servers that an external compaction has completed.",
-      "2.1.0"),
-  @Experimental
-  COMPACTION_COORDINATOR_FINALIZER_COMPLETION_CHECK_INTERVAL(
-      "compaction.coordinator.compaction.finalizer.check.interval", "60s",
-      PropertyType.TIMEDURATION,
-      "The interval at which to check for external compaction final state markers in the metadata table.",
-      "2.1.0"),
-  @Experimental
-  COMPACTION_COORDINATOR_TSERVER_COMPACTION_CHECK_INTERVAL(
-      "compaction.coordinator.tserver.check.interval", "1m", PropertyType.TIMEDURATION,
-      "The interval at which to check the tservers for external compactions.", "2.1.0");
+      "The interval at which to check for dead compactors.", "2.1.0");
 
   private final String key;
   private final String defaultValue;

diff --git a/...c/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java b/...c/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java
@@ -343,11 +343,6 @@ protected long getMissingCompactorWarningTime() {
     return this.ctx.getConfiguration().getTimeInMillis(Property.COMPACTOR_MAX_JOB_WAIT_TIME) * 3;
   }
 
-  protected long getTServerCheckInterval() {
-    return this.ctx.getConfiguration()
-        .getTimeInMillis(Property.COMPACTION_COORDINATOR_TSERVER_COMPACTION_CHECK_INTERVAL);
-  }
-
   public long getNumRunningCompactions() {
     return RUNNING_CACHE.size();
   }

diff --git a/...nager/src/test/java/org/apache/accumulo/manager/compaction/CompactionCoordinatorTest.java b/...nager/src/test/java/org/apache/accumulo/manager/compaction/CompactionCoordinatorTest.java
@@ -143,11 +143,6 @@ protected int countCompactors(String groupName) {
     @Override
     protected void startDeadCompactionDetector() {}
 
-    @Override
-    protected long getTServerCheckInterval() {
-      return 5000L;
-    }
-
     @Override
     protected void startCompactorZKCleaner(ScheduledThreadPoolExecutor schedExecutor) {}
 

diff --git a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompactionTestUtils.java b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompactionTestUtils.java
@@ -227,9 +227,7 @@ public static void configureMiniCluster(MiniAccumuloConfigImpl cfg, Configuratio
         RatioBasedCompactionPlanner.class.getName());
     cfg.setProperty(Property.COMPACTION_SERVICE_PREFIX.getKey() + "cs8.planner.opts.groups",
         "[{'group':'" + GROUP8 + "'}]");
-    cfg.setProperty(Property.COMPACTION_COORDINATOR_FINALIZER_COMPLETION_CHECK_INTERVAL, "5s");
     cfg.setProperty(Property.COMPACTION_COORDINATOR_DEAD_COMPACTOR_CHECK_INTERVAL, "5s");
-    cfg.setProperty(Property.COMPACTION_COORDINATOR_TSERVER_COMPACTION_CHECK_INTERVAL, "3s");
     cfg.setProperty(Property.COMPACTOR_CANCEL_CHECK_INTERVAL, "5s");
     cfg.setProperty(Property.COMPACTOR_PORTSEARCH, "true");
     cfg.setProperty(Property.COMPACTOR_MIN_JOB_WAIT_TIME, "100ms");