From 87995f0572b41f3d21bcd67e7723da7ed7e0f0a5 Mon Sep 17 00:00:00 2001 From: Harry-zklcdc Date: Sun, 16 Feb 2025 22:12:28 +0800 Subject: [PATCH] =?UTF-8?q?[Fix]=20=F0=9F=90=9B=20GPU=20Num=20Restore=20Er?= =?UTF-8?q?ror=20at=20Some=20Scene?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routers/api/v1/admin/instance/forceDelete.go | 2 ++ services/dispatcher/modify.go | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/routers/api/v1/admin/instance/forceDelete.go b/routers/api/v1/admin/instance/forceDelete.go index dfe0be3..ce576b2 100644 --- a/routers/api/v1/admin/instance/forceDelete.go +++ b/routers/api/v1/admin/instance/forceDelete.go @@ -38,6 +38,8 @@ func forceDeleteHandler(ctx iris.Context) { if instance.FromAction == models.InstanceActionStop || instance.FromAction == models.InstanceActionPause || instance.FromAction == models.InstanceActionRestart { redis.RawDB.IncrBy(ctx, "remain_gpu:server:"+strconv.Itoa(int(instance.ServerID)), int64(instance.GpuCount)) + } + if instance.FromAction != models.InstanceActionCreate { redis.RawDB.IncrBy(ctx, "remain_volume:server:"+strconv.Itoa(int(instance.ServerID)), int64(instance.VolumeSize+30)) } diff --git a/services/dispatcher/modify.go b/services/dispatcher/modify.go index 7ede4fb..c94552c 100644 --- a/services/dispatcher/modify.go +++ b/services/dispatcher/modify.go @@ -61,7 +61,6 @@ func modify(serverID uint, data Data) (err error) { err = instanceController.Patch(&instance, gpuCount, volumeSize, data.CpuOnly) if err != nil { ctx := context.Background() - redis.RawDB.IncrBy(ctx, "remain_gpu:server:"+strconv.Itoa(int(serverID)), int64(gpuCount)) redis.RawDB.IncrBy(ctx, "remain_volume:server:"+strconv.Itoa(int(serverID)), int64(volumeSize-oldVolumeSize)) database.DB.Model(&instance).Update("status", models.InstanceStatusFail).Update("from_action", models.InstanceActionModify) lc.Error("patch instance error: %v", err)