fix: update add worker command

This commit is contained in:
jialin
2025-12-10 15:50:53 +08:00
parent d8452e98f5
commit 7fdabd90a5
15 changed files with 56 additions and 48 deletions
+2 -2
View File
@@ -52,14 +52,14 @@ export async function queryWorkersList<T extends Record<string, any>>(
export async function queryGpuDevicesList(params: Global.SearchParams) {
return request<Global.PageResponse<GPUDeviceItem>>(`${GPU_DEVICES_API}`, {
methos: 'GET',
method: 'GET',
params
});
}
export async function queryGPUDeviceItem(id: string) {
return request<GPUDeviceItem>(`${GPU_DEVICES_API}/${id}`, {
methos: 'GET'
method: 'GET'
});
}
+9 -6
View File
@@ -1,7 +1,7 @@
import DeleteModal from '@/components/delete-modal';
import { FilterBar } from '@/components/page-tools';
import useTableFetch from '@/hooks/use-table-fetch';
import { PageContainerInner } from '@/pages/_components/page-box';
import PageBox from '@/pages/_components/page-box';
import { queryClusterList } from '@/pages/cluster-management/apis';
import { DockerStepsFromWorker } from '@/pages/cluster-management/components/add-worker/config';
import {
@@ -65,9 +65,11 @@ const Workers: React.FC = () => {
});
const [clusterData, setClusterData] = useState<{
list: Global.BaseOption<number, ClusterListItem>[];
loading: boolean;
data: Record<number, string>;
}>({
list: [],
loading: false,
data: {}
});
const [workerDetailStatus, setWorkerDetailStatus] = useState<{
@@ -78,7 +80,8 @@ const Workers: React.FC = () => {
currentData: null
});
const { handleAddWorker, AddWorkerModal, setStepList } = useAddWorker({
clusterList: clusterData.list
clusterList: clusterData.list,
clusterLoading: clusterData.loading
});
const getClusterList = async () => {
@@ -103,11 +106,13 @@ const Workers: React.FC = () => {
}));
setClusterData({
list,
loading: false,
data: clusterMap
});
} catch (error) {
setClusterData({
list: [],
loading: false,
data: {}
});
}
@@ -243,9 +248,7 @@ const Workers: React.FC = () => {
return (
<>
<PageContainerInner
footer={terminals.length ? [TerminalPanel] : undefined}
>
<PageBox>
<FilterBar
showSelect={true}
selectHolder={intl.formatMessage({ id: 'clusters.filterBy.cluster' })}
@@ -300,7 +303,7 @@ const Workers: React.FC = () => {
/>
{MaintenanceModal}
{AddWorkerModal}
</PageContainerInner>
</PageBox>
</>
);
};
+14 -10
View File
@@ -81,7 +81,10 @@ const generateNvidiaDockerEnvCommand = (config: {
runtime: string;
driver: string;
}) => {
return `${config.driver} >/dev/null 2>&1 && echo "${config.label} driver OK" || (echo "${config.label} driver issue"; exit 1) && sudo docker info 2>/dev/null | grep -q "${config.runtime}" && echo "${config.label} Container Toolkit OK" || (echo "${config.label} Container Toolkit not configured"; exit 1)`;
const runtimeCheck =
config.runtime === 'nvidia' ? 'Runtime.*nvidia' : config.runtime;
return `${config.driver} >/dev/null 2>&1 && echo "${config.label} driver OK" || (echo "${config.label} driver issue"; exit 1) && sudo docker info 2>/dev/null | grep -q "${runtimeCheck}" && echo "${config.label} Container Toolkit OK" || (echo "${config.label} Container Toolkit not configured"; exit 1)`;
};
// avaliable for Hygon、Iluvatar、MetaX 、Cambricon
@@ -127,15 +130,16 @@ export const dockerEnvCommandMap = {
)
};
const setNormalArgs = (params: any) => {
console.log('params++++++++++++++', params);
return `sudo docker run -d --name gpustack-worker \\
--restart=unless-stopped \\
--privileged \\
--network=host \\
--volume /var/run/docker.sock:/var/run/docker.sock \\
--volume gpustack-data:/var/lib/gpustack \\
${params.modelDir ? `--volume ${params.modelDir}:${params.modelDir} \\` : ''}
${params.cacheDir ? `--volume ${params.cacheDir}:/var/lib/gpustack/cache \\` : ''}`;
return `CONTAINER_NAME="gpustack-worker" \\
sudo docker run -d --name \${CONTAINER_NAME} \\
-e GPUSTACK_RUNTIME_DEPLOY_MIRRORED_NAME=\${CONTAINER_NAME} \\
--restart=unless-stopped \\
--privileged \\
--network=host \\
--volume /var/run/docker.sock:/var/run/docker.sock \\
--volume gpustack-data:/var/lib/gpustack \\
${params.modelDir ? `--volume ${params.modelDir}:${params.modelDir} \\` : ''}
${params.cacheDir ? `--volume ${params.cacheDir}:/var/lib/gpustack/cache \\` : ''}`;
};
const setImageArgs = (params: any) => {