fix(realtime): sync instance/workspace list state without manual refresh
- Invalidate workspace list cache after assigning servers/users so server/user counts on workspace cards update immediately. - Invalidate node/VM caches after workspace server/user assignment so the Nodes page reflects visibility changes right away. - Soft-delete the cached VM/LXC row and broadcast vm_deleted the moment a VM/container is destroyed, instead of waiting for the 10s background sync_vm_cache tick. - Invalidate the VM list on the frontend when a deploy task completes, since the backend already persists the new instance to cache synchronously before marking the task done.
This commit is contained in:
@@ -951,6 +951,13 @@ async def delete_vm(
|
||||
# Удаляем VM
|
||||
result = client.delete_vm(node, vmid)
|
||||
if result:
|
||||
# Помечаем запись в локальном кэше удалённой сразу, не дожидаясь
|
||||
# фонового sync_vm_cache (тикает раз в 10с) — иначе VM ещё
|
||||
# какое-то время висит в списке после реального удаления.
|
||||
try:
|
||||
soft_delete_vm_instance(db, server_id, vmid)
|
||||
except Exception as _sde:
|
||||
logger.warning(f"Failed to soft-delete cached VM {vmid}: {_sde}")
|
||||
# Освобождаем IP в IPAM (если есть)
|
||||
try:
|
||||
ipam = IPAMService(db)
|
||||
@@ -1003,8 +1010,13 @@ async def delete_vm(
|
||||
success=True
|
||||
)
|
||||
logger.info(f"User {current_user.username} deleted VM {vmid} on {server.name}")
|
||||
try:
|
||||
from ...websocket_manager import broadcast_event
|
||||
broadcast_event("vm_deleted", server_id=server_id, vmid=vmid, node=node, name=vm_name, vm_type="qemu")
|
||||
except Exception as _we:
|
||||
logger.warning(f"Failed to broadcast vm_deleted for VM {vmid}: {_we}")
|
||||
return JSONResponse(content={
|
||||
"status": "success",
|
||||
"status": "success",
|
||||
"message": f"VM {vmid} удалена",
|
||||
"snapshots_archived": snapshot_result["archived"],
|
||||
"snapshots_deleted": snapshot_result["deleted"]
|
||||
@@ -1312,6 +1324,13 @@ async def delete_container(
|
||||
# Удаляем контейнер
|
||||
result = client.delete_container(node, vmid)
|
||||
if result:
|
||||
# Помечаем запись в локальном кэше удалённой сразу, не дожидаясь
|
||||
# фонового sync_vm_cache (тикает раз в 10с) — иначе контейнер ещё
|
||||
# какое-то время висит в списке после реального удаления.
|
||||
try:
|
||||
soft_delete_vm_instance(db, server_id, vmid)
|
||||
except Exception as _sde:
|
||||
logger.warning(f"Failed to soft-delete cached container {vmid}: {_sde}")
|
||||
# Освобождаем IP в IPAM (если есть)
|
||||
try:
|
||||
ipam = IPAMService(db)
|
||||
@@ -1359,8 +1378,13 @@ async def delete_container(
|
||||
)
|
||||
|
||||
logger.info(f"User {current_user.username} deleted container {vmid} on {server.name}")
|
||||
try:
|
||||
from ...websocket_manager import broadcast_event
|
||||
broadcast_event("vm_deleted", server_id=server_id, vmid=vmid, node=node, name=container_name, vm_type="lxc")
|
||||
except Exception as _we:
|
||||
logger.warning(f"Failed to broadcast vm_deleted for container {vmid}: {_we}")
|
||||
return JSONResponse(content={
|
||||
"status": "success",
|
||||
"status": "success",
|
||||
"message": f"Контейнер {vmid} удалён",
|
||||
"snapshots_archived": snapshot_result["archived"],
|
||||
"snapshots_deleted": snapshot_result["deleted"]
|
||||
|
||||
Reference in New Issue
Block a user