Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

removed unused compaction properties #4932

Merged
merged 1 commit into from
Oct 1, 2024
Merged

removed unused compaction properties #4932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 1 addition & 16 deletions core/src/main/java/org/apache/accumulo/core/conf/Property.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 0 additions & 5 deletions ...c/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
5 changes: 0 additions & 5 deletions ...nager/src/test/java/org/apache/accumulo/manager/compaction/CompactionCoordinatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {}

Expand Down
2 changes: 0 additions & 2 deletions test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompactionTestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down