Merge pull request #13085 from zexi/migrate-status

fix(region): not override migrating status when manually sync status
This commit is contained in:
Zexi Li
2021-12-30 10:04:21 +08:00
committed by GitHub
@@ -54,6 +54,11 @@ func (self *GuestSyncstatusTask) OnInit(ctx context.Context, obj db.IStandaloneM
self.OnGetStatusSucc(ctx, guest, body)
}
func (self *GuestSyncstatusTask) getOriginStatus() string {
os, _ := self.GetParams().GetString("origin_status")
return os
}
func (self *GuestSyncstatusTask) OnGetStatusSucc(ctx context.Context, guest *models.SGuest, body jsonutils.JSONObject) {
statusStr, _ := body.GetString("status")
switch statusStr {
@@ -68,6 +73,15 @@ func (self *GuestSyncstatusTask) OnGetStatusSucc(ctx context.Context, guest *mod
default:
statusStr = api.VM_UNKNOWN
}
if !self.HasParentTask() {
// migrating status hack
// not change migrating when:
// guest.Status is migrating and task not has parent task
os := self.getOriginStatus()
if os == api.VM_MIGRATING && statusStr == api.VM_RUNNING {
statusStr = os
}
}
blockJobsCount, err := body.Int("block_jobs_count")
if err != nil {
blockJobsCount = -1