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

Merge pull request #18159 from wanyaoqi/automated-cherry-pick-of-#18156-upstream-master

Browse Source 
Automated cherry pick of #18156: fix(region): remove ansible restart network on guest sync
This commit is contained in:
Zexi Li
2023-09-26 17:44:47 +08:00
committed by GitHub
parent d13c6bd52e 4bbd498cf6
commit a9ce12e559
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/tasks/guest_qga_restart_network_task.go
-4
View File
@@ -85,9 +85,5 @@ func (self *GuestQgaRestartNetworkTask) taskFailed(ctx context.Context, guest *m
guest.SetStatus(self.GetUserCred(), api.VM_QGA_SET_NETWORK_FAILED, err.Error())
guest.UpdateQgaStatus(api.QGA_STATUS_EXECUTE_FAILED)
logclient.AddActionLogWithStartable(self, guest, logclient.ACT_RESTART_NETWORK, jsonutils.NewString(err.Error()), self.UserCred, false)
if prevIp != "" {
//use ansible to restart network
guest.StartRestartNetworkTask(ctx, self.UserCred, "", prevIp, inBlockStream)
}
self.SetStageFailed(ctx, nil)
}
pkg/compute/tasks/guest_sync_task.go
+2 -5
View File
@@ -75,10 +75,6 @@ func (self *GuestSyncConfTask) StartRestartNetworkTask(ctx context.Context, gues
return
}
inBlockStream := jsonutils.QueryBoolean(self.Params, "in_block_stream", false)
if guest.Hypervisor != api.HYPERVISOR_KVM {
guest.StartRestartNetworkTask(ctx, self.UserCred, "", prevIp, inBlockStream)
return
}
preMac, err := self.Params.GetString("prev_mac")
if err != nil {
log.Errorf("unable to get prev_mac when restart_network is true when sync guest")
@@ -124,7 +120,8 @@ func (self *GuestSyncConfTask) StartRestartNetworkTask(ctx context.Context, gues
}()
if err != nil {
log.Errorf("guest %s failed start qga restart network task: %s", guest.GetName(), err)
guest.StartRestartNetworkTask(ctx, self.UserCred, "", prevIp, inBlockStream)
guest.SetStatus(self.GetUserCred(), api.VM_QGA_SET_NETWORK_FAILED, err.Error())
logclient.AddActionLogWithStartable(self, guest, logclient.ACT_RESTART_NETWORK, jsonutils.NewString(err.Error()), self.UserCred, false)
}
}