fix: support moving LXC container disks to other storage
Disk move was hardcoded to the QEMU move_disk Proxmox API and was
never reachable in the UI for LXC (no Hardware tab for containers,
and the disk list regex only matched VM device names).
- add move_container_disk() using lxc/{vmid}/move_volume
- add POST /api/{server_id}/container/{vmid}/disk/move endpoint
- route useMoveDisk by instance type (vm vs container prefix)
- recognize rootfs/mp\d+ as LXC disk devices
- add a Move disk card on the Settings tab for LXC instances
- filter target storage list by supported content type
(rootdir for LXC, images for VM) instead of showing all storages
This commit is contained in:
@@ -1930,6 +1930,46 @@ async def resize_container_disk(
|
||||
raise HTTPException(status_code=500, detail=str(e))
|
||||
|
||||
|
||||
@router.post("/api/{server_id}/container/{vmid}/disk/move")
|
||||
async def move_container_disk(
|
||||
server_id: int,
|
||||
vmid: int,
|
||||
node: str,
|
||||
request: Request,
|
||||
db: Session = Depends(get_db),
|
||||
current_user: User = Depends(PermissionChecker("server:manage"))
|
||||
):
|
||||
"""Переместить том контейнера в другое хранилище (move_volume)."""
|
||||
server = db.query(ProxmoxServer).filter(ProxmoxServer.id == server_id).first()
|
||||
if not server:
|
||||
raise HTTPException(status_code=404, detail="Proxmox server not found")
|
||||
|
||||
data = await request.json()
|
||||
disk = data.get('disk')
|
||||
target_storage = data.get('target_storage')
|
||||
if not disk or not target_storage:
|
||||
raise HTTPException(status_code=400, detail="Требуются параметры disk и target_storage")
|
||||
|
||||
try:
|
||||
client = _get_proxmox_client(server)
|
||||
if not client.is_connected():
|
||||
raise HTTPException(status_code=503, detail="Failed to connect to Proxmox server")
|
||||
|
||||
result = client.move_container_disk(
|
||||
node, vmid, disk, target_storage,
|
||||
delete=bool(data.get('delete', True)),
|
||||
)
|
||||
if result.get('success'):
|
||||
logger.info(f"User {current_user.username} moved volume {disk} of container {vmid} to {target_storage}")
|
||||
return JSONResponse(content={"status": "success", "upid": result.get('upid')})
|
||||
raise HTTPException(status_code=400, detail=result.get('error', 'Failed'))
|
||||
except HTTPException:
|
||||
raise
|
||||
except Exception as e:
|
||||
logger.error(f"Error moving container {vmid} disk: {e}")
|
||||
raise HTTPException(status_code=500, detail=str(e))
|
||||
|
||||
|
||||
@router.get("/api/{server_id}/container/{vmid}/config")
|
||||
def get_container_config(
|
||||
server_id: int,
|
||||
|
||||
@@ -1541,6 +1541,34 @@ class ProxmoxClient(VmMixin, LxcMixin, ClusterMixin, StorageMixin, NetworkMixin,
|
||||
logger.info(f"Диск {disk} LXC {vmid} изменен на {size}")
|
||||
return True
|
||||
|
||||
def move_container_disk(self, node: str, vmid: int, disk: str, target_storage: str,
|
||||
delete: bool = True) -> Dict:
|
||||
"""Переместить том LXC контейнера в другое хранилище (POST lxc/{vmid}/move_volume).
|
||||
|
||||
Args:
|
||||
disk: имя тома (rootfs, mp0, mp1, ...)
|
||||
target_storage: целевое хранилище
|
||||
delete: удалить исходный том после копирования
|
||||
Returns:
|
||||
{"success": bool, "upid"?: str, "error"?: str}
|
||||
"""
|
||||
if not self.proxmox:
|
||||
return {"success": False, "error": "Not connected"}
|
||||
try:
|
||||
params = {"volume": disk, "storage": target_storage, "delete": 1 if delete else 0}
|
||||
upid = self.proxmox.nodes(node).lxc(vmid).move_volume.post(**params)
|
||||
if isinstance(upid, str):
|
||||
if not self.wait_for_task(node, upid, timeout=3600):
|
||||
status = self.get_task_status(node, upid) or {}
|
||||
reason = status.get("exitstatus") or "move_volume task failed"
|
||||
logger.error(f"Move тома {disk} LXC {vmid} провалился: {reason}")
|
||||
return {"success": False, "error": f"Proxmox: {reason}"}
|
||||
logger.info(f"Том {disk} LXC {vmid} перемещён в {target_storage}")
|
||||
return {"success": True, "upid": upid if isinstance(upid, str) else None}
|
||||
except Exception as e:
|
||||
logger.error(f"Ошибка перемещения тома {disk} LXC {vmid}: {e}")
|
||||
return {"success": False, "error": str(e)}
|
||||
|
||||
def get_vm_interfaces(self, node: str, vmid: int) -> List[Dict]:
|
||||
"""
|
||||
Получить сетевые интерфейсы VM через QEMU guest agent
|
||||
|
||||
@@ -326,21 +326,23 @@ function DiskManagementCard({ serverId, vmid, type, node }: Props) {
|
||||
const { t } = useTranslation();
|
||||
const confirm = useConfirm();
|
||||
const { data: config } = useVMConfig(serverId, vmid, type, node);
|
||||
const { data: storages = [] } = useLXCStorages(serverId, node);
|
||||
const moveDisk = useMoveDisk(serverId, vmid, node);
|
||||
// Только хранилища, поддерживающие нужный тип контента (rootdir для LXC, images для VM) —
|
||||
// иначе Proxmox отклонит задачу переноса уже после запуска.
|
||||
const { data: storages = [] } = useLXCStorages(serverId, node, type === 'lxc' ? 'rootdir' : 'images');
|
||||
const moveDisk = useMoveDisk(serverId, vmid, type, node);
|
||||
const addDisk = useAddDisk(serverId, vmid, node);
|
||||
const detachDisk = useDetachDisk(serverId, vmid, node);
|
||||
|
||||
// Реальные дисковые устройства (без cd-rom и cloudinit)
|
||||
const disks = useMemo(() => {
|
||||
if (!config) return [] as string[];
|
||||
const re = /^(scsi\d+|sata\d+|virtio\d+|ide\d+)$/;
|
||||
const re = type === 'lxc' ? /^(rootfs|mp\d+)$/ : /^(scsi\d+|sata\d+|virtio\d+|ide\d+)$/;
|
||||
return Object.entries(config)
|
||||
.filter(([k, v]) => re.test(k) && typeof v === 'string'
|
||||
&& !v.includes('media=cdrom') && !v.includes('cloudinit')
|
||||
&& !v.startsWith('/dev/')) // проброшенные физдиски — управляются в блоке «Проброс устройств»
|
||||
.map(([k]) => k);
|
||||
}, [config]);
|
||||
}, [config, type]);
|
||||
|
||||
const [moveDiskDev, setMoveDiskDev] = useState('');
|
||||
const [moveStorage, setMoveStorage] = useState('');
|
||||
|
||||
@@ -12,7 +12,9 @@ import {
|
||||
SelectTrigger,
|
||||
SelectValue,
|
||||
} from '@/components/ui/select';
|
||||
import { useVMConfig, useUpdateConfig, useResizeDisk } from '@/hooks/use-instances';
|
||||
import { useVMConfig, useUpdateConfig, useResizeDisk, useMoveDisk } from '@/hooks/use-instances';
|
||||
import { useLXCStorages } from '@/hooks/use-lxc-templates';
|
||||
import { Checkbox } from '@/components/ui/checkbox';
|
||||
import { toast } from 'sonner';
|
||||
|
||||
interface Props {
|
||||
@@ -264,3 +266,75 @@ export function DiskResizeCard({ serverId, vmid, type, node }: Props) {
|
||||
</Card>
|
||||
);
|
||||
}
|
||||
|
||||
// ==================== Move disk to another storage ====================
|
||||
|
||||
export function DiskMoveCard({ serverId, vmid, type, node }: Props) {
|
||||
const { t } = useTranslation();
|
||||
const { data: config } = useVMConfig(serverId, vmid, type, node);
|
||||
// Только хранилища, поддерживающие нужный тип контента (rootdir для LXC, images для VM) —
|
||||
// иначе Proxmox отклонит задачу переноса уже после запуска.
|
||||
const { data: storages = [] } = useLXCStorages(serverId, node, type === 'lxc' ? 'rootdir' : 'images');
|
||||
const moveDisk = useMoveDisk(serverId, vmid, type, node);
|
||||
|
||||
const diskDevices = useMemo(() => {
|
||||
if (!config) return [] as string[];
|
||||
const re = type === 'lxc' ? /^(rootfs|mp\d+)$/ : /^(scsi\d+|sata\d+|virtio\d+|ide\d+)$/;
|
||||
return Object.entries(config)
|
||||
.filter(([k, v]) => re.test(k) && typeof v === 'string' && !v.includes('media=cdrom'))
|
||||
.map(([k]) => k);
|
||||
}, [config, type]);
|
||||
|
||||
const [moveDiskDev, setMoveDiskDev] = useState('');
|
||||
const [moveStorage, setMoveStorage] = useState('');
|
||||
const [moveDelete, setMoveDelete] = useState(true);
|
||||
|
||||
useEffect(() => {
|
||||
if (diskDevices.length && !diskDevices.includes(moveDiskDev)) setMoveDiskDev(diskDevices[0]);
|
||||
}, [diskDevices, moveDiskDev]);
|
||||
|
||||
const doMove = () => {
|
||||
if (!moveDiskDev || !moveStorage) return;
|
||||
moveDisk.mutate(
|
||||
{ disk: moveDiskDev, target_storage: moveStorage, delete: moveDelete },
|
||||
{
|
||||
onSuccess: () => { toast.success(t('instances.disk_moved')); setMoveStorage(''); },
|
||||
onError: (e: Error) => toast.error(e.message),
|
||||
}
|
||||
);
|
||||
};
|
||||
|
||||
return (
|
||||
<Card>
|
||||
<CardHeader className="pb-2">
|
||||
<CardTitle className="text-sm font-semibold">{t('instances.disk_move')}</CardTitle>
|
||||
</CardHeader>
|
||||
<CardContent className="space-y-4">
|
||||
<div className="grid gap-4 sm:grid-cols-2">
|
||||
<div className="space-y-1.5">
|
||||
<Label>{t('instances.disk_device')}</Label>
|
||||
<Select value={moveDiskDev} onValueChange={(v) => v && setMoveDiskDev(v)}>
|
||||
<SelectTrigger><SelectValue placeholder={t('instances.disk_device')} /></SelectTrigger>
|
||||
<SelectContent>{diskDevices.map((d) => <SelectItem key={d} value={d}>{d}</SelectItem>)}</SelectContent>
|
||||
</Select>
|
||||
</div>
|
||||
<div className="space-y-1.5">
|
||||
<Label>{t('instances.migrate_target_storage')}</Label>
|
||||
<Select value={moveStorage} onValueChange={(v) => v && setMoveStorage(v)}>
|
||||
<SelectTrigger><SelectValue placeholder={t('instances.migrate_target_storage')} /></SelectTrigger>
|
||||
<SelectContent>{storages.map((s) => <SelectItem key={s.storage} value={s.storage}>{s.storage} ({s.type})</SelectItem>)}</SelectContent>
|
||||
</Select>
|
||||
</div>
|
||||
</div>
|
||||
<label className="flex items-center gap-2 text-xs">
|
||||
<Checkbox checked={moveDelete} onChange={(e) => setMoveDelete(e.target.checked)} />
|
||||
<span>{t('instances.disk_move_delete')}</span>
|
||||
</label>
|
||||
<Button size="sm" variant="outline" onClick={doMove} disabled={!moveDiskDev || !moveStorage || moveDisk.isPending}>
|
||||
{moveDisk.isPending && <Loader2 className="mr-2 h-4 w-4 animate-spin" />}
|
||||
{t('instances.disk_move')}
|
||||
</Button>
|
||||
</CardContent>
|
||||
</Card>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@ import { useVMConfig, useUpdateConfig, useVMOwner, useSetVMOwner, useExecuteScri
|
||||
import { useProfile } from '@/hooks/use-settings';
|
||||
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
|
||||
import { toast } from 'sonner';
|
||||
import { ComputeResourcesCard, DiskResizeCard } from './ResourceCards';
|
||||
import { ComputeResourcesCard, DiskResizeCard, DiskMoveCard } from './ResourceCards';
|
||||
|
||||
interface Props {
|
||||
serverId: number;
|
||||
@@ -736,6 +736,8 @@ export default function SettingsTab({ serverId, vmid, type, node }: Props) {
|
||||
|
||||
{type === 'lxc' && <DiskResizeCard serverId={serverId} vmid={vmid} type={type} node={node} />}
|
||||
|
||||
{type === 'lxc' && <DiskMoveCard serverId={serverId} vmid={vmid} type={type} node={node} />}
|
||||
|
||||
<SavedConfigCard serverId={serverId} vmid={vmid} />
|
||||
|
||||
{/* Raw Config */}
|
||||
|
||||
@@ -592,11 +592,12 @@ export function useUpdateCloudInit(serverId: number, vmid: number, node: string)
|
||||
});
|
||||
}
|
||||
|
||||
export function useMoveDisk(serverId: number, vmid: number, node: string) {
|
||||
export function useMoveDisk(serverId: number, vmid: number, type: string, node: string) {
|
||||
const qc = useQueryClient();
|
||||
const prefix = type === 'lxc' ? 'container' : 'vm';
|
||||
return useMutation({
|
||||
mutationFn: (body: { disk: string; target_storage: string; delete?: boolean; format?: string }) =>
|
||||
apiClient.post(`/proxmox/api/${serverId}/vm/${vmid}/disk/move?node=${node}`, body),
|
||||
apiClient.post(`/proxmox/api/${serverId}/${prefix}/${vmid}/disk/move?node=${node}`, body),
|
||||
onSuccess: () => qc.invalidateQueries({ queryKey: vmKeys.config(serverId, vmid) }),
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user