From c73ac42b3761a2298eb287161d1f3862962bb111 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= Date: Wed, 20 Mar 2024 18:20:04 +0800 Subject: [PATCH] fix(region): skip set lost name when purge deleted vm (#19752) --- pkg/compute/models/guests.go | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkg/compute/models/guests.go b/pkg/compute/models/guests.go index f48577028cb..47b54d88bdf 100644 --- a/pkg/compute/models/guests.go +++ b/pkg/compute/models/guests.go @@ -2974,13 +2974,6 @@ func (self *SGuest) SyncRemoveCloudVM(ctx context.Context, userCred mcclient.Tok } } - if !lostNamePattern.MatchString(self.Name) { - db.Update(self, func() error { - self.Name = fmt.Sprintf("%s-lost@%s", self.Name, timeutils.ShortDate(time.Now())) - return nil - }) - } - if self.Status != api.VM_UNKNOWN { self.SetStatus(ctx, userCred, api.VM_UNKNOWN, "Sync lost") } @@ -2995,6 +2988,15 @@ func (self *SGuest) SyncRemoveCloudVM(ctx context.Context, userCred mcclient.Tok Obj: self, Action: notifyclient.ActionSyncDelete, }) + + return nil + } + + if !lostNamePattern.MatchString(self.Name) { + db.Update(self, func() error { + self.Name = fmt.Sprintf("%s-lost@%s", self.Name, timeutils.ShortDate(time.Now())) + return nil + }) } return nil