opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-19 02:37:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(region): reset status to block_stream after restarting network

Browse Source
This commit is contained in:
rainzm
2022-01-10 15:28:58 +08:00
parent 1d4a7445f9
commit 0d5642ea72
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/guest_actions.go
+3
View File
@@ -2159,6 +2159,9 @@ func (self *SGuest) PerformChangeIpaddr(ctx context.Context, userCred mcclient.T
if self.Hypervisor == api.HYPERVISOR_KVM && restartNetwork && (self.Status == api.VM_RUNNING || self.Status == api.VM_BLOCK_STREAM) {
taskData.Set("restart_network", jsonutils.JSONTrue)
taskData.Set("prev_ip", jsonutils.NewString(gn.IpAddr))
if self.Status == api.VM_BLOCK_STREAM {
taskData.Set("in_block_stream", jsonutils.JSONTrue)
}
self.SetStatus(userCred, api.VM_RESTART_NETWORK, "restart network")
}
return nil, self.startSyncTask(ctx, userCred, true, "", taskData)
pkg/compute/tasks/guest_sync_task.go
+1 -1
View File
@@ -64,7 +64,7 @@ func (self *GuestSyncConfTask) OnSyncComplete(ctx context.Context, obj db.IStand
self.SetStageComplete(ctx, nil)
return
}
if guest.Status == api.VM_BLOCK_STREAM {
if inBlockStream := jsonutils.QueryBoolean(self.Params, "in_block_stream", false); inBlockStream {
guest.StartRestartNetworkTask(ctx, self.UserCred, "", prevIp, true)
} else {
guest.StartRestartNetworkTask(ctx, self.UserCred, "", prevIp, false)