Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
4f14ccf
Remove usage of skife from DruidCoordinatorConfig
kfaraz Jan 17, 2024
34e3bd4
Remove old config class
kfaraz Jan 17, 2024
7db4bc4
Address static checks
kfaraz Jan 17, 2024
748d37b
Fix tests
kfaraz Jan 17, 2024
550d0bb
Remove unnecessary mocks
kfaraz Jan 17, 2024
da9c528
Merge branch 'master' of github.com:apache/druid into remove_coord_sk…
kfaraz Jan 18, 2024
a85ec53
Fix config typos
kfaraz Jan 18, 2024
611d940
Merge branch 'master' of github.com:apache/druid into remove_coord_sk…
kfaraz Feb 9, 2024
06b97cb
Fix config condition
kfaraz Feb 13, 2024
b0c7fa1
Merge branch 'master' of github.com:apache/druid into remove_coord_sk…
kfaraz Feb 29, 2024
7f55e9a
Merge branch 'master' of github.com:apache/druid into remove_coord_sk…
kfaraz Mar 22, 2024
e9a5e64
Merge branch 'master' of github.com:apache/druid into remove_coord_sk…
kfaraz Apr 19, 2024
62f8920
Fix test, spotbug check
kfaraz Apr 19, 2024
0020446
Move validation to DruidCoordinatorConfig
kfaraz Apr 19, 2024
6ce7c26
Move DruidCoordinatorConfig to different package
kfaraz Apr 19, 2024
18e79a4
Fix validation of killunusedconfig
kfaraz Apr 19, 2024
1c26bc1
Simplify and fix KillSupervisorsCustomDuty
kfaraz Apr 19, 2024
a2a928c
Address review comments
kfaraz Apr 24, 2024
0f18464
Merge branch 'master' of github.com:apache/druid into remove_coord_sk…
kfaraz Apr 25, 2024
47a9e4e
Fix new tests
kfaraz Apr 25, 2024
032f2b7
Add KillUnusedSchemasConfig
kfaraz Apr 25, 2024
c10a5c9
Remove KillUnusedSchemasConfig
kfaraz Apr 25, 2024
9e79a07
Minor renames
kfaraz Apr 29, 2024
65d774d
Merge branch 'master' of github.com:apache/druid into remove_coord_sk…
kfaraz Apr 29, 2024
c7b04af
Merge branch 'master' of github.com:apache/druid into remove_coord_sk…
kfaraz Apr 29, 2024
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
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@
import org.apache.druid.server.DruidNode;
import org.apache.druid.server.coordinator.balancer.BalancerStrategyFactory;
import org.apache.druid.server.coordinator.compact.CompactionSegmentSearchPolicy;
import org.apache.druid.server.coordinator.config.CoordinatorKillConfigs;
import org.apache.druid.server.coordinator.config.DruidCoordinatorConfig;
import org.apache.druid.server.coordinator.config.KillUnusedSegmentsConfig;
import org.apache.druid.server.coordinator.duty.BalanceSegments;
import org.apache.druid.server.coordinator.duty.CollectSegmentAndServerStats;
import org.apache.druid.server.coordinator.duty.CompactSegments;
Expand Down Expand Up @@ -189,7 +192,6 @@ public DruidCoordinator(
ServiceAnnouncer serviceAnnouncer,
@Self DruidNode self,
CoordinatorCustomDutyGroups customDutyGroups,
BalancerStrategyFactory balancerStrategyFactory,
LookupCoordinatorManager lookupCoordinatorManager,
@Coordinator DruidLeaderSelector coordLeaderSelector,
CompactionSegmentSearchPolicy compactionSegmentSearchPolicy,
Expand All @@ -209,7 +211,7 @@ public DruidCoordinator(

this.executorFactory = scheduledExecutorFactory;

this.balancerStrategyFactory = balancerStrategyFactory;
this.balancerStrategyFactory = config.getBalancerStrategyFactory();
this.lookupCoordinatorManager = lookupCoordinatorManager;
this.coordLeaderSelector = coordLeaderSelector;
this.compactSegments = initializeCompactSegmentsDuty(compactionSegmentSearchPolicy);
Expand Down Expand Up @@ -562,10 +564,13 @@ private List<CoordinatorDuty> makeHistoricalManagementDuties()
List<CoordinatorDuty> makeIndexingServiceDuties()
{
final List<CoordinatorDuty> duties = new ArrayList<>();
if (config.isKillUnusedSegmentsEnabled()) {
duties.add(new KillUnusedSegments(metadataManager.segments(), overlordClient, config));
final KillUnusedSegmentsConfig killUnusedConfig = config.getKillConfigs().unusedSegments(
config.getCoordinatorIndexingPeriod()
);
if (killUnusedConfig.isCleanupEnabled()) {
duties.add(new KillUnusedSegments(metadataManager.segments(), overlordClient, killUnusedConfig));
}
if (config.isKillPendingSegmentsEnabled()) {
if (config.getKillConfigs().pendingSegments().isCleanupEnabled()) {
duties.add(new KillStalePendingSegments(overlordClient));
}

Expand All @@ -582,16 +587,23 @@ List<CoordinatorDuty> makeIndexingServiceDuties()

private List<CoordinatorDuty> makeMetadataStoreManagementDuties()
{
List<CoordinatorDuty> duties = new ArrayList<>();

duties.add(new KillSupervisors(config, metadataManager.supervisors()));
duties.add(new KillAuditLog(config, metadataManager.audit()));
duties.add(new KillRules(config, metadataManager.rules()));
duties.add(new KillDatasourceMetadata(config, metadataManager.indexer(), metadataManager.supervisors()));
duties.add(new KillCompactionConfig(config, metadataManager.segments(), metadataManager.configs()));

final CoordinatorKillConfigs killConfigs = config.getKillConfigs();
final List<CoordinatorDuty> duties = new ArrayList<>();
duties.add(new KillSupervisors(killConfigs.supervisors(), metadataManager.supervisors()));
duties.add(new KillAuditLog(killConfigs.auditLogs(), metadataManager.audit()));
duties.add(new KillRules(killConfigs.rules(), metadataManager.rules()));
duties.add(
new KillDatasourceMetadata(
killConfigs.datasources(),
metadataManager.indexer(),
metadataManager.supervisors()
)
);
duties.add(
new KillCompactionConfig(killConfigs.compactionConfigs(), metadataManager.segments(), metadataManager.configs())
);
if (centralizedDatasourceSchemaConfig.isEnabled()) {
duties.add(new KillUnreferencedSegmentSchemaDuty(config, metadataManager.schemas()));
duties.add(new KillUnreferencedSegmentSchemaDuty(killConfigs.segmentSchemas(), metadataManager.schemas()));
}
return duties;
}
Expand Down

This file was deleted.

Loading