Skip to content

Web console: Change to use overlord APIs vs coordinator APIs #18172

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
vogievetsky merged 1 commit into from
Jun 25, 2025
Merged

Web console: Change to use overlord APIs vs coordinator APIs #18172

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
6 changes: 3 additions & 3 deletions web-console/src/dialogs/kill-datasource-dialog/kill-datasource-dialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ export const KillDatasourceDialog = function KillDatasourceDialog(
className="kill-datasource-dialog"
action={async () => {
const resp = await Api.instance.delete(
`/druid/coordinator/v1/datasources/${Api.encodePath(
datasource,
)}?kill=true&interval=${Api.encodePath(interval)}`,
`/druid/indexer/v1/datasources/${Api.encodePath(datasource)}/intervals/${Api.encodePath(
interval.replace(/\//g, '_'),
)}`,
{},
);
return resp.data;
Expand Down
193 changes: 98 additions & 95 deletions web-console/src/views/datasources-view/datasources-view.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -708,7 +708,7 @@ GROUP BY 1, 2`;
<AsyncActionDialog
action={async () => {
const resp = await Api.instance.delete(
`/druid/coordinator/v1/datasources/${Api.encodePath(
`/druid/indexer/v1/datasources/${Api.encodePath(
datasourceToMarkAsUnusedAllSegmentsIn,
)}`,
{},
Expand Down Expand Up @@ -749,7 +749,7 @@ GROUP BY 1, 2`;
<AsyncActionDialog
action={async () => {
const resp = await Api.instance.post(
`/druid/coordinator/v1/datasources/${Api.encodePath(
`/druid/indexer/v1/datasources/${Api.encodePath(
datasourceToMarkAllNonOvershadowedSegmentsAsUsedIn,
)}`,
{},
Expand Down Expand Up @@ -792,7 +792,7 @@ GROUP BY 1, 2`;
if (!useUnuseInterval) return;
const param = isUse ? 'markUsed' : 'markUnused';
const resp = await Api.instance.post(
`/druid/coordinator/v1/datasources/${Api.encodePath(
`/druid/indexer/v1/datasources/${Api.encodePath(
datasourceToMarkSegmentsByIntervalIn,
)}/${Api.encodePath(param)}`,
{
Expand Down Expand Up @@ -1006,29 +1006,8 @@ GROUP BY 1, 2`;
): BasicAction[] {
const { goToQuery, goToSegments, capabilities } = this.props;

const goToActions: BasicAction[] = [];

if (capabilities.hasSql()) {
goToActions.push({
icon: IconNames.APPLICATION,
title: 'Query with SQL',
onAction: () => goToQuery({ queryString: SqlQuery.create(T(datasource)).toString() }),
});
}

goToActions.push({
icon: IconNames.STACKED_CHART,
title: 'Go to segments',
onAction: () => {
goToSegments({ datasource });
},
});

if (!capabilities.hasCoordinatorAccess()) {
return goToActions;
}

if (unused) {
if (!capabilities.hasOverlordAccess()) return [];
return [
{
icon: IconNames.EXPORT,
Expand All @@ -1055,77 +1034,101 @@ GROUP BY 1, 2`;
},
];
} else {
return goToActions.concat(
compact([
{
icon: IconNames.AUTOMATIC_UPDATES,
title: 'Edit retention rules',
onAction: () => {
const defaultRules = this.state.datasourcesAndDefaultRulesState.data?.defaultRules;
if (!defaultRules) return;
this.setState({
retentionDialogOpenOn: {
datasource,
rules: rules || [],
defaultRules,
},
});
},
},
{
icon: IconNames.REFRESH,
title: 'Mark as used all segments (will lead to reapplying retention rules)',
onAction: () =>
this.setState({
datasourceToMarkAllNonOvershadowedSegmentsAsUsedIn: datasource,
}),
},
compactionInfo
? {
icon: IconNames.COMPRESSED,
title: 'Edit compaction configuration',
onAction: () => {
this.setState({
compactionDialogOpenOn: {
datasource,
compactionConfig: compactionInfo.config,
},
});
},
}
: undefined,
{
icon: IconNames.EXPORT,
title: 'Mark as used segments by interval',
onAction: () =>
this.setState({
datasourceToMarkSegmentsByIntervalIn: datasource,
useUnuseAction: 'use',
}),
},
{
icon: IconNames.IMPORT,
title: 'Mark as unused segments by interval',
onAction: () =>
this.setState({
datasourceToMarkSegmentsByIntervalIn: datasource,
useUnuseAction: 'unuse',
}),
},
{
icon: IconNames.IMPORT,
title: 'Mark as unused all segments',
intent: Intent.DANGER,
onAction: () => this.setState({ datasourceToMarkAsUnusedAllSegmentsIn: datasource }),
},
{
icon: IconNames.TRASH,
title: 'Delete unused segments (issue kill task)',
intent: Intent.DANGER,
onAction: () => this.setState({ killDatasource: datasource }),
return compact([
capabilities.hasSql()
? {
icon: IconNames.APPLICATION,
title: 'Query with SQL',
onAction: () => goToQuery({ queryString: SqlQuery.create(T(datasource)).toString() }),
}
: undefined,
{
icon: IconNames.STACKED_CHART,
title: 'Go to segments',
onAction: () => {
goToSegments({ datasource });
},
]),
);
},
capabilities.hasCoordinatorAccess()
? {
icon: IconNames.AUTOMATIC_UPDATES,
title: 'Edit retention rules',
onAction: () => {
const defaultRules = this.state.datasourcesAndDefaultRulesState.data?.defaultRules;
if (!defaultRules) return;
this.setState({
retentionDialogOpenOn: {
datasource,
rules: rules || [],
defaultRules,
},
});
},
}
: undefined,
capabilities.hasOverlordAccess()
? {
icon: IconNames.REFRESH,
title: 'Mark as used all segments (will lead to reapplying retention rules)',
onAction: () =>
this.setState({
datasourceToMarkAllNonOvershadowedSegmentsAsUsedIn: datasource,
}),
}
: undefined,
capabilities.hasCoordinatorAccess() && compactionInfo
? {
icon: IconNames.COMPRESSED,
title: 'Edit compaction configuration',
onAction: () => {
this.setState({
compactionDialogOpenOn: {
datasource,
compactionConfig: compactionInfo.config,
},
});
},
}
: undefined,
capabilities.hasOverlordAccess()
? {
icon: IconNames.EXPORT,
title: 'Mark as used segments by interval',
onAction: () =>
this.setState({
datasourceToMarkSegmentsByIntervalIn: datasource,
useUnuseAction: 'use',
}),
}
: undefined,
capabilities.hasOverlordAccess()
? {
icon: IconNames.IMPORT,
title: 'Mark as unused segments by interval',
onAction: () =>
this.setState({
datasourceToMarkSegmentsByIntervalIn: datasource,
useUnuseAction: 'unuse',
}),
}
: undefined,
capabilities.hasOverlordAccess()
? {
icon: IconNames.IMPORT,
title: 'Mark as unused all segments',
intent: Intent.DANGER,
onAction: () => this.setState({ datasourceToMarkAsUnusedAllSegmentsIn: datasource }),
}
: undefined,
capabilities.hasOverlordAccess()
? {
icon: IconNames.TRASH,
title: 'Delete unused segments (issue kill task)',
intent: Intent.DANGER,
onAction: () => this.setState({ killDatasource: datasource }),
}
: undefined,
]);
}
}

Expand Down
22 changes: 14 additions & 8 deletions web-console/src/views/segments-view/segments-view.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,13 +546,19 @@ export class SegmentsView extends React.PureComponent<SegmentsViewProps, Segment
}

private getSegmentActions(id: string, datasource: string): BasicAction[] {
const { capabilities } = this.props;
const actions: BasicAction[] = [];
actions.push({
icon: IconNames.IMPORT,
title: 'Drop segment (disable)',
intent: Intent.DANGER,
onAction: () => this.setState({ terminateSegmentId: id, terminateDatasourceId: datasource }),
});

if (capabilities.hasOverlordAccess()) {
actions.push({
icon: IconNames.IMPORT,
title: 'Drop segment (disable)',
intent: Intent.DANGER,
onAction: () =>
this.setState({ terminateSegmentId: id, terminateDatasourceId: datasource }),
});
}

return actions;
}

Expand Down Expand Up @@ -1017,15 +1023,15 @@ export class SegmentsView extends React.PureComponent<SegmentsViewProps, Segment
<AsyncActionDialog
action={async () => {
const resp = await Api.instance.delete(
`/druid/coordinator/v1/datasources/${Api.encodePath(
`/druid/indexer/v1/datasources/${Api.encodePath(
terminateDatasourceId,
)}/segments/${Api.encodePath(terminateSegmentId)}`,
{},
);
return resp.data;
}}
confirmButtonText="Drop segment"
successText="Segment drop request acknowledged, next time the coordinator runs segment will be dropped"
successText="Segment drop request acknowledged, next time the overlord runs segment will be dropped"
failText="Could not drop segment"
intent={Intent.DANGER}
onClose={() => {
Expand Down