Skip to content

Fix flakiness in compaction ITs #17877

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

Merged
cryptoe merged 1 commit into from
Apr 4, 2025
Merged

Fix flakiness in compaction ITs #17877

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
23 changes: 23 additions & 0 deletions server/src/main/java/org/apache/druid/server/coordinator/CoordinatorConfigManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import org.apache.druid.audit.AuditInfo;
import org.apache.druid.audit.AuditManager;
import org.apache.druid.common.config.ConfigManager;
import org.apache.druid.common.config.Configs;
import org.apache.druid.common.config.JacksonConfigManager;
import org.apache.druid.error.DruidException;
import org.apache.druid.error.InternalServerError;
Expand Down Expand Up @@ -152,6 +153,28 @@ public DruidCompactionConfig convertBytesToCompactionConfig(byte[] bytes)
);
}

public boolean updateCompactionTaskSlots(
@Nullable Double compactionTaskSlotRatio,
@Nullable Integer maxCompactionTaskSlots,
AuditInfo auditInfo
)
{
UnaryOperator<DruidCompactionConfig> operator = current -> {
final ClusterCompactionConfig currentClusterConfig = current.clusterConfig();
final ClusterCompactionConfig updatedClusterConfig = new ClusterCompactionConfig(
Configs.valueOrDefault(compactionTaskSlotRatio, currentClusterConfig.getCompactionTaskSlotRatio()),
Configs.valueOrDefault(maxCompactionTaskSlots, currentClusterConfig.getMaxCompactionTaskSlots()),
currentClusterConfig.getCompactionPolicy(),
currentClusterConfig.isUseSupervisors(),
currentClusterConfig.getEngine()
);

return current.withClusterConfig(updatedClusterConfig);
};

return updateConfigHelper(operator, auditInfo);
}

public boolean updateClusterCompactionConfig(
ClusterCompactionConfig config,
AuditInfo auditInfo
Expand Down
13 changes: 1 addition & 12 deletions server/src/main/java/org/apache/druid/server/http/CoordinatorCompactionConfigsResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,8 @@
import com.google.inject.Inject;
import com.sun.jersey.spi.container.ResourceFilters;
import org.apache.druid.audit.AuditInfo;
import org.apache.druid.common.config.Configs;
import org.apache.druid.error.InvalidInput;
import org.apache.druid.indexer.CompactionEngine;
import org.apache.druid.server.coordinator.ClusterCompactionConfig;
import org.apache.druid.server.coordinator.CoordinatorConfigManager;
import org.apache.druid.server.coordinator.DataSourceCompactionConfig;
import org.apache.druid.server.http.security.ConfigResourceFilter;
Expand Down Expand Up @@ -85,18 +83,9 @@ public Response setCompactionTaskLimit(
return ServletResourceUtils.buildUpdateResponse(() -> true);
}

final ClusterCompactionConfig currentConfig = configManager.getCurrentCompactionConfig().clusterConfig();
final ClusterCompactionConfig updatedClusterConfig = new ClusterCompactionConfig(
Configs.valueOrDefault(compactionTaskSlotRatio, currentConfig.getCompactionTaskSlotRatio()),
Configs.valueOrDefault(maxCompactionTaskSlots, currentConfig.getMaxCompactionTaskSlots()),
currentConfig.getCompactionPolicy(),
currentConfig.isUseSupervisors(),
currentConfig.getEngine()
);

final AuditInfo auditInfo = AuthorizationUtils.buildAuditInfo(req);
return ServletResourceUtils.buildUpdateResponse(
() -> configManager.updateClusterCompactionConfig(updatedClusterConfig, auditInfo)
() -> configManager.updateCompactionTaskSlots(compactionTaskSlotRatio, maxCompactionTaskSlots, auditInfo)
);
}

Expand Down
Loading