opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-16 06:57:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(region): do not stop registed baremetal server on fake delete (#25814)

Browse Source
This commit is contained in:
wanyaoqi
2026-10-09 13:41:32 +08:00
committed by GitHub
parent be72ef1a5f
commit 77f0be0e33
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/options/options.go
+3 -2
View File
@@ -105,8 +105,9 @@ type ComputeOptions struct {
SystemAdminQuotaCheck bool `help:"Enable quota check for system admin, default False" default:"false"`
CloudaccountHealthStatusCheck bool `help:"Enable cloudaccount health status check, default True" default:"true"`
BaremetalPreparePackageUrl string `help:"Baremetal online register package"`
BaremetalPrepareServerFakeDelete bool `help:"Baremetal registed server fake delete" default:"false"`
BaremetalPreparePackageUrl string `help:"Baremetal online register package"`
BaremetalPrepareServerFakeDelete bool `help:"Baremetal registed server fake delete" default:"false"`
BaremetalPrepareServerFakeDeleteKeepRunning bool `help:"Baremetal registed server fake delete keep guest running" default:"true"`
// snapshot options
AutoSnapshotDay int `default:"1" help:"Days auto snapshot disks, default 1 day"`
pkg/compute/tasks/guest/guest_delete_task.go
+6
View File
@@ -58,6 +58,12 @@ func (deleteTask *BaseGuestDeleteTask) OnInit(ctx context.Context, obj db.IStand
deleteTask.OnGuestStopComplete(ctx, guest, data)
return
}
purgeBmImportServerFakeDelete := host.IsImport && options.Options.BaremetalPrepareServerFakeDelete
if purgeBmImportServerFakeDelete && options.Options.BaremetalPrepareServerFakeDeleteKeepRunning {
deleteTask.OnGuestStopComplete(ctx, guest, data)
return
}
if len(guest.BackupHostId) > 0 {
deleteTask.SetStage("OnMasterHostStopGuestComplete", nil)
if err := drv.RequestStopGuestForDelete(ctx, guest, nil, deleteTask); err != nil {