From 629c9982ab727f7bfb514a2865f6a70cf2d33375 Mon Sep 17 00:00:00 2001 From: wanyaoqi <18528551+wanyaoqi@users.noreply.github.com> Date: Sat, 24 Feb 2024 07:53:56 +0800 Subject: [PATCH] fix(region): update rescuing status to rescue (#19543) --- pkg/apis/compute/guest_const.go | 2 +- pkg/compute/tasks/guest_rescue_task.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/apis/compute/guest_const.go b/pkg/apis/compute/guest_const.go index dcf45078d1..bc11054af8 100644 --- a/pkg/apis/compute/guest_const.go +++ b/pkg/apis/compute/guest_const.go @@ -47,7 +47,7 @@ const ( VM_UNSYNC = "unsync" VM_START_RESCUE = "start_rescue" - VM_RESCUING = "rescuing" + VM_RESCUE = "rescue" VM_STOP_RESCUE = "stop_rescue" VM_START_RESCUE_FAILED = "start_rescue_failed" VM_STOP_RESCUE_FAILED = "stop_rescue_failed" diff --git a/pkg/compute/tasks/guest_rescue_task.go b/pkg/compute/tasks/guest_rescue_task.go index 19b9281516..32ab0054ae 100644 --- a/pkg/compute/tasks/guest_rescue_task.go +++ b/pkg/compute/tasks/guest_rescue_task.go @@ -112,7 +112,7 @@ func (self *StartRescueTask) OnRescueStartServerComplete(ctx context.Context, gu logclient.AddActionLogWithStartable(self, guest, logclient.ACT_VM_START_RESCUE, guest.GetShortDesc(ctx), self.UserCred, true) // Set guest status to rescue running - guest.SetStatus(ctx, self.UserCred, api.VM_RESCUING, "OnRescueStartServerComplete") + guest.SetStatus(ctx, self.UserCred, api.VM_RESCUE, "OnRescueStartServerComplete") self.SetStageComplete(ctx, nil) } @@ -135,7 +135,7 @@ func (self *StopRescueTask) OnInit(ctx context.Context, obj db.IStandaloneModel, // Flow: stop -> modify startvm script for rescue -> start guest := obj.(*models.SGuest) // Check if guest is running - if guest.Status == api.VM_RUNNING || guest.Status == api.VM_RESCUING { + if guest.Status == api.VM_RUNNING || guest.Status == api.VM_RESCUE { self.StopServer(ctx, guest) } else { self.ClearRescue(ctx, guest)