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)