Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 @@ -684,6 +684,37 @@ paths:
application/json:
schema:
$ref: '#/components/schemas/HTTPValidationError'
/edge_worker/ui/worker/{worker_name}:
delete:
tags:
- UI
summary: Delete Worker
description: Delete a worker record from the system.
operationId: delete_worker
security:
- OAuth2PasswordBearer: []
- HTTPBearer: []
parameters:
- name: worker_name
in: path
required: true
schema:
type: string
title: Worker Name
responses:
'200':
description: Successful Response
content:
application/json:
schema:
type: 'null'
title: Response Delete Worker
'422':
description: Validation Error
content:
application/json:
schema:
$ref: '#/components/schemas/HTTPValidationError'
components:
schemas:
BundleInfo:
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,4 @@ export type JobsServiceStateMutationResult = Awaited<ReturnType<typeof JobsServi
export type WorkerServiceSetStateMutationResult = Awaited<ReturnType<typeof WorkerService.setState>>;
export type WorkerServiceUpdateQueuesMutationResult = Awaited<ReturnType<typeof WorkerService.updateQueues>>;
export type UiServiceExitWorkerMaintenanceMutationResult = Awaited<ReturnType<typeof UiService.exitWorkerMaintenance>>;
export type UiServiceDeleteWorkerMutationResult = Awaited<ReturnType<typeof UiService.deleteWorker>>;
Original file line number Diff line number Diff line change
Expand Up @@ -102,3 +102,8 @@ export const useUiServiceExitWorkerMaintenance = <TData = Common.UiServiceExitWo
}, TContext>, "mutationFn">) => useMutation<TData, TError, {
workerName: string;
}, TContext>({ mutationFn: ({ workerName }) => UiService.exitWorkerMaintenance({ workerName }) as unknown as Promise<TData>, ...options });
export const useUiServiceDeleteWorker = <TData = Common.UiServiceDeleteWorkerMutationResult, TError = unknown, TContext = unknown>(options?: Omit<UseMutationOptions<TData, TError, {
workerName: string;
}, TContext>, "mutationFn">) => useMutation<TData, TError, {
workerName: string;
}, TContext>({ mutationFn: ({ workerName }) => UiService.deleteWorker({ workerName }) as unknown as Promise<TData>, ...options });
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import type { CancelablePromise } from './core/CancelablePromise';
import { OpenAPI } from './core/OpenAPI';
import { request as __request } from './core/request';
import type { FetchData, FetchResponse, StateData, StateResponse, LogfilePathData, LogfilePathResponse, PushLogsData, PushLogsResponse, RegisterData, RegisterResponse, SetStateData, SetStateResponse, UpdateQueuesData, UpdateQueuesResponse, HealthResponse, WorkerResponse, JobsResponse, RequestWorkerMaintenanceData, RequestWorkerMaintenanceResponse, ExitWorkerMaintenanceData, ExitWorkerMaintenanceResponse, RequestWorkerShutdownData, RequestWorkerShutdownResponse } from './types.gen';
import type { FetchData, FetchResponse, StateData, StateResponse, LogfilePathData, LogfilePathResponse, PushLogsData, PushLogsResponse, RegisterData, RegisterResponse, SetStateData, SetStateResponse, UpdateQueuesData, UpdateQueuesResponse, HealthResponse, WorkerResponse, JobsResponse, RequestWorkerMaintenanceData, RequestWorkerMaintenanceResponse, ExitWorkerMaintenanceData, ExitWorkerMaintenanceResponse, RequestWorkerShutdownData, RequestWorkerShutdownResponse, DeleteWorkerData, DeleteWorkerResponse } from './types.gen';

export class JobsService {
/**
Expand Down Expand Up @@ -352,4 +352,25 @@ export class UiService {
});
}

/**
* Delete Worker
* Delete a worker record from the system.
* @param data The data for the request.
* @param data.workerName
* @returns null Successful Response
* @throws ApiError
*/
public static deleteWorker(data: DeleteWorkerData): CancelablePromise<DeleteWorkerResponse> {
return __request(OpenAPI, {
method: 'DELETE',
url: '/edge_worker/ui/worker/{worker_name}',
path: {
worker_name: data.workerName
},
errors: {
422: 'Validation Error'
}
});
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -489,6 +489,12 @@ export type RequestWorkerShutdownData = {

export type RequestWorkerShutdownResponse = null;

export type DeleteWorkerData = {
workerName: string;
};

export type DeleteWorkerResponse = null;

export type $OpenApiTs = {
'/edge_worker/v1/jobs/fetch/{worker_name}': {
post: {
Expand Down Expand Up @@ -724,4 +730,19 @@ export type $OpenApiTs = {
};
};
};
'/edge_worker/ui/worker/{worker_name}': {
delete: {
req: DeleteWorkerData;
res: {
/**
* Successful Response
*/
200: null;
/**
* Validation Error
*/
422: HTTPValidationError;
};
};
};
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
/*!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
import { Button, CloseButton, Dialog, IconButton, Portal, Text, useDisclosure } from "@chakra-ui/react";
import { useUiServiceDeleteWorker } from "openapi/queries";
import { FaRegTrashCan } from "react-icons/fa6";

interface WorkerDeleteButtonProps {
onDelete: (toast: Record<string, string>) => void;
workerName: string;
}

export const WorkerDeleteButton = ({ onDelete, workerName }: WorkerDeleteButtonProps) => {
const { onClose, onOpen, open } = useDisclosure();

const deleteMutation = useUiServiceDeleteWorker({
onError: (error) => {
onDelete({
description: `Unable to delete worker ${workerName}: ${error}`,
title: "Delete Worker Failed",
type: "error",
});
},
onSuccess: () => {
onDelete({
description: `Worker ${workerName} has been deleted from the system.`,
title: "Worker Deleted",
type: "success",
});
onClose();
},
});

const handleDelete = () => {
deleteMutation.mutate({ workerName });
};

return (
<>
<IconButton
size="sm"
variant="ghost"
onClick={onOpen}
aria-label="Delete Worker"
title="Delete Worker"
color="red.500"
>
<FaRegTrashCan />
</IconButton>

<Dialog.Root onOpenChange={onClose} open={open} size="md">
<Portal>
<Dialog.Backdrop />
<Dialog.Positioner>
<Dialog.Content>
<Dialog.Header>
<Dialog.Title>Delete worker {workerName}</Dialog.Title>
</Dialog.Header>
<Dialog.Body>
<Text>Are you sure you want to delete worker {workerName}?</Text>
<Text fontSize="sm" color="red.500" mt={2}>
This will permanently remove the worker record from the system. This action cannot be
undone.
</Text>
</Dialog.Body>
<Dialog.Footer>
<Dialog.ActionTrigger asChild>
<Button variant="outline">Cancel</Button>
</Dialog.ActionTrigger>
<Button
onClick={handleDelete}
colorScheme="red"
loading={deleteMutation.isPending}
loadingText="Deleting..."
>
Delete Worker
</Button>
</Dialog.Footer>
<Dialog.CloseTrigger asChild>
<CloseButton size="sm" />
</Dialog.CloseTrigger>
</Dialog.Content>
</Dialog.Positioner>
</Portal>
</Dialog.Root>
</>
);
};
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import { toaster } from "src/components/ui";

import { MaintenanceEnterButton } from "./MaintenanceEnterButton";
import { MaintenanceExitButton } from "./MaintenanceExitButton";
import { WorkerDeleteButton } from "./WorkerDeleteButton";
import { WorkerShutdownButton } from "./WorkerShutdownButton";

interface WorkerOperationsProps {
Expand Down Expand Up @@ -59,10 +60,19 @@ export const WorkerOperations = ({ onOperations, worker }: WorkerOperationsProps
</Box>
<Flex justifyContent="end" gap={2}>
<MaintenanceExitButton onExitMaintenance={onWorkerChange} workerName={workerName} />
{state === "offline maintenance" && (
<WorkerDeleteButton onDelete={onWorkerChange} workerName={workerName} />
)}
<WorkerShutdownButton onShutdown={onWorkerChange} workerName={workerName} />
</Flex>
</VStack>
);
} else if (state === "offline" || state === "unknown") {
return (
<Flex justifyContent="end">
<WorkerDeleteButton onDelete={onWorkerChange} workerName={workerName} />
</Flex>
);
}
return null;
};
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@ export const WorkerShutdownButton = ({ onShutdown, workerName }: WorkerShutdownB
<Dialog.Body>
<Text>Are you sure you want to request shutdown for worker {workerName}?</Text>
<Text fontSize="sm" color="red.500" mt={2}>
This will terminate the worker process on the remote edge site.
This stops the worker on the remote edge. You can't restart it from the UI—start it remotely
instead.
</Text>
</Dialog.Body>
<Dialog.Footer>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
from airflow.providers.edge3.models.edge_worker import (
EdgeWorkerModel,
exit_maintenance,
remove_worker,
request_maintenance,
request_shutdown,
)
Expand Down Expand Up @@ -184,3 +185,26 @@ def request_worker_shutdown(
request_shutdown(worker_name, session=session)
except Exception as e:
raise HTTPException(status.HTTP_400_BAD_REQUEST, detail=str(e))


@ui_router.delete(
"/worker/{worker_name}",
dependencies=[
Depends(requires_access_view(access_view=AccessView.JOBS)),
],
)
def delete_worker(
worker_name: str,
session: SessionDep,
) -> None:
"""Delete a worker record from the system."""
# Check if worker exists first
worker_query = select(EdgeWorkerModel).where(EdgeWorkerModel.worker_name == worker_name)
worker = session.scalar(worker_query)
if not worker:
raise HTTPException(status.HTTP_404_NOT_FOUND, detail=f"Worker {worker_name} not found")

try:
remove_worker(worker_name, session=session)
except Exception as e:
raise HTTPException(status.HTTP_400_BAD_REQUEST, detail=str(e))
2 changes: 1 addition & 1 deletion providers/edge3/www-hash.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3279a0aacccafb0389ade571b71fae3cba5a5058a1a74a1566bf1d07e31857b7
ce4a5788c09ba08749e1964b3a93829d4200f12721173196f99aada9f653d3e1