Skip to content

[controller][test] Remove legacy log.compaction.threshold.ms config #2888

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

Closed
pthirun wants to merge 1 commit into from
Closed

[controller][test] Remove legacy log.compaction.threshold.ms config #2888

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
5 changes: 0 additions & 5 deletions internal/venice-common/src/main/java/com/linkedin/venice/ConfigKeys.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,11 +469,6 @@ private ConfigKeys() {
*/
public static final String LOG_COMPACTION_INTERVAL_MS = "log.compaction.interval.ms";

/**
* Time since last log compaction before a store is considered for log compaction
*/
public static final String LOG_COMPACTION_THRESHOLD_MS = "log.compaction.threshold.ms";

/**
* Version staleness threshold to decide when a store should be nominated for compaction
*/
Expand Down
9 changes: 5 additions & 4 deletions .../venice-test-common/src/integrationTest/java/com/linkedin/venice/endToEnd/TestHybrid.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import static com.linkedin.venice.ConfigKeys.LOG_COMPACTION_ENABLED;
import static com.linkedin.venice.ConfigKeys.LOG_COMPACTION_INTERVAL_MS;
import static com.linkedin.venice.ConfigKeys.LOG_COMPACTION_SCHEDULING_ENABLED;
import static com.linkedin.venice.ConfigKeys.LOG_COMPACTION_THRESHOLD_MS;
import static com.linkedin.venice.ConfigKeys.LOG_COMPACTION_VERSION_STALENESS_THRESHOLD_MS;
import static com.linkedin.venice.ConfigKeys.PERSISTENCE_TYPE;
import static com.linkedin.venice.ConfigKeys.REPUSH_ORCHESTRATOR_CLASS_NAME;
import static com.linkedin.venice.ConfigKeys.SERVER_CONSUMER_POOL_ALLOCATION_STRATEGY;
Expand Down Expand Up @@ -152,7 +152,7 @@ public class TestHybrid {
// Log compaction test constants
private static final long TEST_LOG_COMPACTION_INTERVAL_MS = TimeUnit.SECONDS.toMillis(1);
private static final long TEST_LOG_COMPACTION_TIMEOUT = TEST_LOG_COMPACTION_INTERVAL_MS * 10; // ms
private static final long TEST_TIME_SINCE_LAST_LOG_COMPACTION_THRESHOLD_MS = 0;
private static final long TEST_VERSION_STALENESS_THRESHOLD_MS = 0;

/**
* IMPORTANT NOTE: if you use this sharedVenice cluster, please do not close it. The {@link #cleanUp()} function
Expand Down Expand Up @@ -1706,8 +1706,9 @@ private static VeniceClusterWrapper setUpCluster(boolean enablePartitionWiseShar
extraProperties.setProperty(LOG_COMPACTION_ENABLED, "true");
extraProperties.setProperty(LOG_COMPACTION_SCHEDULING_ENABLED, "true");
extraProperties.setProperty(LOG_COMPACTION_INTERVAL_MS, String.valueOf(TEST_LOG_COMPACTION_INTERVAL_MS));
extraProperties
.setProperty(LOG_COMPACTION_THRESHOLD_MS, String.valueOf(TEST_TIME_SINCE_LAST_LOG_COMPACTION_THRESHOLD_MS));
extraProperties.setProperty(
LOG_COMPACTION_VERSION_STALENESS_THRESHOLD_MS,
String.valueOf(TEST_VERSION_STALENESS_THRESHOLD_MS));
VeniceClusterCreateOptions options = new VeniceClusterCreateOptions.Builder().numberOfControllers(1)
.numberOfServers(0)
.numberOfRouters(0)
Expand Down
6 changes: 2 additions & 4 deletions ...ontroller/src/main/java/com/linkedin/venice/controller/VeniceControllerClusterConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,6 @@
import static com.linkedin.venice.ConfigKeys.LOG_COMPACTION_INTERVAL_MS;
import static com.linkedin.venice.ConfigKeys.LOG_COMPACTION_SCHEDULING_ENABLED;
import static com.linkedin.venice.ConfigKeys.LOG_COMPACTION_THREAD_COUNT;
import static com.linkedin.venice.ConfigKeys.LOG_COMPACTION_THRESHOLD_MS;
import static com.linkedin.venice.ConfigKeys.LOG_COMPACTION_VERSION_STALENESS_THRESHOLD_MS;
import static com.linkedin.venice.ConfigKeys.META_STORE_WRITER_CLOSE_CONCURRENCY;
import static com.linkedin.venice.ConfigKeys.META_STORE_WRITER_CLOSE_TIMEOUT_MS;
Expand Down Expand Up @@ -1257,9 +1256,8 @@ public VeniceControllerClusterConfig(VeniceProperties props) {
this.repushOrchestratorConfigs = props.clipAndFilterNamespace(CONTROLLER_REPUSH_PREFIX);
this.logCompactionThreadCount = props.getInt(LOG_COMPACTION_THREAD_COUNT, 1);
this.logCompactionIntervalMS = props.getLong(LOG_COMPACTION_INTERVAL_MS, TimeUnit.HOURS.toMillis(1));
this.logCompactionVersionStalenessThresholdMS = props.getLong(
LOG_COMPACTION_VERSION_STALENESS_THRESHOLD_MS,
props.getLong(LOG_COMPACTION_THRESHOLD_MS, TimeUnit.HOURS.toMillis(24)));
this.logCompactionVersionStalenessThresholdMS =
props.getLong(LOG_COMPACTION_VERSION_STALENESS_THRESHOLD_MS, TimeUnit.HOURS.toMillis(24));
this.logCompactionDuplicateKeyThreshold = props.getLong(LOG_COMPACTION_DUPLICATE_KEY_THRESHOLD, 0);

this.isDeadStoreEndpointEnabled = props.getBoolean(ConfigKeys.CONTROLLER_DEAD_STORE_ENDPOINT_ENABLED, false);
Expand Down