root/gpustack-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: update add worker command

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/cluster-management/components/add-worker/add-worker-context.ts
+1
View File
@@ -5,6 +5,7 @@ import { SummaryDataKey } from './config';
interface AddWorkerContextProps {
clusterList?: Global.BaseOption<number, ClusterListItem>[];
clusterLoading?: boolean;
provider: ProviderType;
stepList: string[];
onClusterChange?: (value: number, row?: any) => void;
src/pages/cluster-management/components/add-worker/add-worker-step.tsx
+3
View File
@@ -30,6 +30,7 @@ const Container = styled.div`
type AddWorkerProps = {
provider: ProviderType;
clusterList?: Global.BaseOption<number, ClusterListItem>[];
clusterLoading?: boolean;
stepList: StepName[];
onClusterChange?: (value: number, row?: any) => void;
registrationInfo: {
@@ -50,6 +51,7 @@ const AddWorkerSteps: React.FC<AddWorkerProps> = (props) => {
registrationInfo,
provider,
clusterList,
clusterLoading,
stepList = [],
onClusterChange
} = props || {};
@@ -77,6 +79,7 @@ const AddWorkerSteps: React.FC<AddWorkerProps> = (props) => {
<AddWorkerContext.Provider
value={{
clusterList,
clusterLoading,
provider,
stepList: stepList,
collapseKey,
src/pages/cluster-management/components/add-worker/index.tsx
+3 -11
View File
@@ -1,27 +1,17 @@
import ScrollerModal from '@/components/scroller-modal';
import React, { useEffect } from 'react';
import styled from 'styled-components';
import { queryClusterToken } from '../../apis';
import { ProviderType } from '../../config';
import { ClusterListItem } from '../../config/types';
import AddWorkerStep from './add-worker-step';
import { StepName } from './config';
const Container = styled.div`
margin: 0 auto;
display: flex;
flex-direction: column;
gap: 16px;
.command-info {
margin-bottom: 8px;
}
`;
type AddWorkerProps = {
open: boolean;
provider: ProviderType;
title: string;
clusterList?: Global.BaseOption<number, ClusterListItem>[];
clusterLoading?: boolean;
stepList: StepName[];
onClusterChange?: (value: number, row?: any) => void;
onCancel: () => void;
@@ -47,6 +37,7 @@ const AddWorker: React.FC<AddWorkerProps> = (props) => {
cluster_id,
title,
clusterList,
clusterLoading,
stepList = []
} = props || {};
const firstLoad = React.useRef(true);
@@ -103,6 +94,7 @@ const AddWorker: React.FC<AddWorkerProps> = (props) => {
stepList={stepList}
provider={provider}
clusterList={clusterList}
clusterLoading={clusterLoading}
onClusterChange={handleOnClusterChange}
registrationInfo={registrationInfo}
></AddWorkerStep>
src/pages/cluster-management/components/add-worker/select-cluster.tsx
+11 -7
View File
@@ -1,5 +1,6 @@
import BaseSelect from '@/components/seal-form/base/select';
import { useIntl } from '@umijs/max';
import { Spin } from 'antd';
import { useEffect } from 'react';
import { useAddWorkerContext } from './add-worker-context';
import { StepNamesMap } from './config';
@@ -9,6 +10,7 @@ import StepCollapse from './step-collapse';
const SelectCluster = () => {
const {
clusterList,
clusterLoading,
registrationInfo,
stepList,
summary,
@@ -55,13 +57,15 @@ const SelectCluster = () => {
</div>
}
>
<BaseSelect
defaultValue={registrationInfo.cluster_id}
options={clusterList}
value={clusterId}
onChange={onClusterChange}
style={{ width: '100%' }}
/>
<Spin spinning={clusterLoading}>
<BaseSelect
defaultValue={registrationInfo.cluster_id}
options={clusterList}
value={clusterId}
onChange={onClusterChange}
style={{ width: '100%' }}
/>
</Spin>
</StepCollapse>
);
};
src/pages/cluster-management/components/footer-buttons.tsx
+1 -1
View File
@@ -43,7 +43,7 @@ const FooterButtons: React.FC<FooterButtonsProps> = (props) => {
)}
{showButtons.skip && (
<Button type="primary" onClick={handleCancel}>
{intl.formatMessage({ id: 'clusters.create.skipfornow' })}
{intl.formatMessage({ id: 'common.button.done' })}
</Button>
)}
{showButtons.save && (
src/pages/cluster-management/hooks/use-add-worker.tsx
+3 -1
View File
@@ -11,10 +11,11 @@ import {
import { ClusterListItem } from '../config/types';
const useAddWorker = (props: {
clusterLoading?: boolean;
clusterList?: Global.BaseOption<number, ClusterListItem>[];
}) => {
const intl = useIntl();
const { clusterList } = props || {};
const { clusterList, clusterLoading } = props || {};
const [stepList, setStepList] = useState<StepName[]>([]);
const [openAddWorker, setOpenAddWorker] = useState<{
open: boolean;
@@ -73,6 +74,7 @@ const useAddWorker = (props: {
open={openAddWorker.open}
provider={openAddWorker.provider}
clusterList={clusterDataList}
clusterLoading={clusterLoading}
cluster_id={openAddWorker.cluster_id}
onClusterChange={handleClusterChange}
onCancel={() =>
src/pages/llmodels/apis/index.ts
+2 -2
View File
@@ -56,7 +56,7 @@ export async function queryModelsList(
return request<Global.PageResponse<ListItem>>(
`${MODELS_API}?${qs.stringify(params)}`,
{
methos: 'GET',
method: 'GET',
...options
}
);
@@ -360,7 +360,7 @@ export async function queryCatalogList(
return request<Global.PageResponse<CatalogItem>>(
`/model-sets?${qs.stringify(params)}`,
{
methos: 'GET',
method: 'GET',
...options
}
);
src/pages/resources/apis/index.ts
+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'
});
}
src/pages/resources/components/workers.tsx
+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>
</>
);
};
src/pages/resources/config/gpu-driver.ts
+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) => {
src/pages/users/apis/index.ts
+1 -1
View File
@@ -5,7 +5,7 @@ export const USERS_API = '/users';
export async function queryUsersList(params: Global.SearchParams) {
return request<Global.PageResponse<ListItem>>(`${USERS_API}`, {
methos: 'GET',
method: 'GET',
params
});
}