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

Automatic merge from release/2.7.0 -> release/2.8.0

Browse Source 
* commit '6c4f42d3806ebc95574977fcfa37989e5fcf1242':
  fix live migrate set status
This commit is contained in:
邱剑
2019-03-20 22:20:41 +08:00
parent 4a938fef93 6c4f42d380
commit 0cb39ba521
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/tasks/guest_live_migrate_task.go
+5 -13
View File
@@ -356,26 +356,18 @@ func (self *GuestLiveMigrateTask) OnResumeDestGuestComplete(ctx context.Context,
func (self *GuestLiveMigrateTask) OnUndeploySrcGuestComplete(ctx context.Context, guest *models.SGuest, data jsonutils.JSONObject) {
db.OpsLog.LogEvent(guest, db.ACT_MIGRATE, "", self.UserCred)
status, _ := self.Params.GetString("guest_status")
if status != models.VM_RUNNING {
guest.SetStatus(self.UserCred, status, "")
self.SetStageComplete(ctx, nil)
} else {
self.SetStage("OnStartGeustComplete", nil)
guest.StartGueststartTask(ctx, self.UserCred, nil, self.GetTaskId())
if status != guest.Status {
self.SetStage("OnGuestSyncStatus", nil)
guest.StartSyncstatus(ctx, self.UserCred, self.GetTaskId())
}
}
func (self *GuestLiveMigrateTask) OnStartGeustComplete(ctx context.Context, guest *models.SGuest, data jsonutils.JSONObject) {
func (self *GuestLiveMigrateTask) OnGuestSyncStatus(ctx context.Context, guest *models.SGuest, data jsonutils.JSONObject) {
self.SetStageComplete(ctx, nil)
}
func (self *GuestMigrateTask) TaskFailed(ctx context.Context, guest *models.SGuest, reason string) {
status, _ := self.Params.GetString("guest_status")
if status != models.VM_RUNNING {
guest.SetStatus(self.UserCred, status, "")
} else {
guest.StartGueststartTask(ctx, self.UserCred, nil, "")
}
guest.SetStatus(self.UserCred, models.VM_MIGRATE_FAILED, reason)
db.OpsLog.LogEvent(guest, db.ACT_MIGRATE_FAIL, reason, self.UserCred)
self.SetStageFailed(ctx, reason)
notifyclient.NotifySystemError(guest.Id, guest.Name, models.VM_MIGRATE_FAILED, reason)