(accumulo) branch main updated: removed unused compaction properties (#4932)

[ctubbsii]

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

ctubbsii pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/main by this push:
     new 9541725adb removed unused compaction properties (#4932)
9541725adb is described below

commit 9541725adbd016a243d1c77f9a293c9f9b6447f8
Author: Keith Turner <ktur...@apache.org>
AuthorDate: Tue Oct 1 00:15:06 2024 -0400

    removed unused compaction properties (#4932)
    
    Changes in how compactions work left three compaction properites unused
    and this change removes them.
---
 .../java/org/apache/accumulo/core/conf/Property.java    | 17 +----------------
 .../compaction/coordinator/CompactionCoordinator.java   |  5 -----
 .../manager/compaction/CompactionCoordinatorTest.java   |  5 -----
 .../test/compaction/ExternalCompactionTestUtils.java    |  2 --
 4 files changed, 1 insertion(+), 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
index 47f2f77628..f3417c2f59 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
@@ -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/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java
 
b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java
index 1941a762df..722e467120 100644
--- 
a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java
+++ 
b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java
@@ -343,11 +343,6 @@ public class CompactionCoordinator
     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/server/manager/src/test/java/org/apache/accumulo/manager/compaction/CompactionCoordinatorTest.java
 
b/server/manager/src/test/java/org/apache/accumulo/manager/compaction/CompactionCoordinatorTest.java
index 9967610691..ae2cd37223 100644
--- 
a/server/manager/src/test/java/org/apache/accumulo/manager/compaction/CompactionCoordinatorTest.java
+++ 
b/server/manager/src/test/java/org/apache/accumulo/manager/compaction/CompactionCoordinatorTest.java
@@ -143,11 +143,6 @@ public class CompactionCoordinatorTest {
     @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
index 256751b036..c3e24401a2 100644
--- 
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 class ExternalCompactionTestUtils {
         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");