Skip to content

Fix Grid cache invalidation for multi-run task operations #55504

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
eladkal merged 4 commits into from
Sep 12, 2025
Merged

Fix Grid cache invalidation for multi-run task operations #55504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2098064
Fix Grid cache invalidation for multi-run task operations
bggwak Sep 11, 2025
f184b08
made the code simpler
bggwak Sep 12, 2025
c44e6c2
Restore variable name
bggwak Sep 12, 2025
303326a
fix typescript error
bggwak Sep 12, 2025
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
9 changes: 8 additions & 1 deletion airflow-core/src/airflow/ui/src/queries/useClearTaskInstances.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import {
useTaskInstanceServicePostClearTaskInstances,
UseGridServiceGetGridRunsKeyFn,
UseGridServiceGetGridTiSummariesKeyFn,
useGridServiceGetGridTiSummariesKey,
} from "openapi/queries";
import type { ClearTaskInstancesBody, TaskInstanceCollectionResponse } from "openapi/requests/types.gen";
import { toaster } from "src/components/ui";
Expand Down Expand Up @@ -78,14 +79,20 @@ export const useClearTaskInstances = ({
),
];

// Check if this clear operation affects multiple DAG runs
const { include_future: includeFuture, include_past: includePast } = variables.requestBody;
const affectsMultipleRuns = includeFuture === true || includePast === true;

const queryKeys = [
...taskInstanceKeys,
UseDagRunServiceGetDagRunKeyFn({ dagId, dagRunId }),
[useDagRunServiceGetDagRunsKey],
[useClearTaskInstancesDryRunKey, dagId],
[usePatchTaskInstanceDryRunKey, dagId, dagRunId],
UseGridServiceGetGridRunsKeyFn({ dagId }, [{ dagId }]),
UseGridServiceGetGridTiSummariesKeyFn({ dagId, runId: dagRunId }, [{ dagId, runId: dagRunId }]),
affectsMultipleRuns
? [useGridServiceGetGridTiSummariesKey, { dagId }]
: UseGridServiceGetGridTiSummariesKeyFn({ dagId, runId: dagRunId }),
Comment thread
bggwak marked this conversation as resolved.
];

await Promise.all(queryKeys.map((key) => queryClient.invalidateQueries({ queryKey: key })));
Expand Down
19 changes: 17 additions & 2 deletions airflow-core/src/airflow/ui/src/queries/usePatchTaskInstance.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import {
useTaskInstanceServicePatchTaskInstance,
UseGridServiceGetGridRunsKeyFn,
UseGridServiceGetGridTiSummariesKeyFn,
useGridServiceGetGridTiSummariesKey,
} from "openapi/queries";
import { toaster } from "src/components/ui";

Expand Down Expand Up @@ -58,15 +59,29 @@ export const usePatchTaskInstance = ({
});
};

const onSuccessFn = async () => {
const onSuccessFn = async (
_: unknown,
variables: {
dagId: string;
dagRunId: string;
requestBody: { include_future?: boolean; include_past?: boolean };
taskId: string;
},
) => {
// Check if this patch operation affects multiple DAG runs
const { include_future: includeFuture, include_past: includePast } = variables.requestBody;
const affectsMultipleRuns = includeFuture === true || includePast === true;

const queryKeys = [
UseTaskInstanceServiceGetTaskInstanceKeyFn({ dagId, dagRunId, taskId }),
UseTaskInstanceServiceGetMappedTaskInstanceKeyFn({ dagId, dagRunId, mapIndex, taskId }),
[useTaskInstanceServiceGetTaskInstancesKey],
[usePatchTaskInstanceDryRunKey, dagId, dagRunId, { mapIndex, taskId }],
[useClearTaskInstancesDryRunKey, dagId],
UseGridServiceGetGridRunsKeyFn({ dagId }, [{ dagId }]),
UseGridServiceGetGridTiSummariesKeyFn({ dagId, runId: dagRunId }, [{ dagId, runId: dagRunId }]),
affectsMultipleRuns
? [useGridServiceGetGridTiSummariesKey, { dagId }]
: UseGridServiceGetGridTiSummariesKeyFn({ dagId, runId: dagRunId }),
];

await Promise.all(queryKeys.map((key) => queryClient.invalidateQueries({ queryKey: key })));
Expand Down