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 #9360 from ioito/bugfix/qx-server-sync

Browse Source 
fix(region): sync servers
This commit is contained in:
Zexi Li
2020-12-21 10:40:29 +08:00
committed by GitHub
parent ae5e28c58c ae060f2347
commit 331e60e100
5 changed files with 45 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/tasks/baremetal_sync_status_task.go
+4 -8
View File
@@ -95,15 +95,11 @@ func (self *BaremetalSyncAllGuestsStatusTask) OnInit(ctx context.Context, obj db
}
func (self *BaremetalSyncAllGuestsStatusTask) OnGuestSyncStatusComplete(ctx context.Context, baremetal *models.SHost, body jsonutils.JSONObject) {
var guests = make([]models.SGuest, 0)
for _, guest := range baremetal.GetGuests() {
if guest.Status == api.VM_UNKNOWN && guest.Hypervisor != api.HYPERVISOR_BAREMETAL {
guest.SetStatus(self.UserCred, models.SYNC_STATUS, "")
guests = append(guests, guest)
}
}
guests, _ := baremetal.GetGuests()
for _, guest := range guests {
guest.StartSyncstatus(ctx, self.UserCred, "")
if guest.Status == api.VM_UNKNOWN && guest.Hypervisor != api.HYPERVISOR_BAREMETAL {
guest.StartSyncstatus(ctx, self.GetUserCred(), "")
}
}
log.Infof("All unknown guests syncstatus complete")
self.SetStageComplete(ctx, nil)
pkg/compute/tasks/baremetal_unconvert_hypervisor_task.go
+7 -1
View File
@@ -19,6 +19,7 @@ import (
"yunion.io/x/jsonutils"
"yunion.io/x/log"
"yunion.io/x/pkg/errors"
api "yunion.io/x/onecloud/pkg/apis/compute"
"yunion.io/x/onecloud/pkg/cloudcommon/db"
@@ -38,9 +39,14 @@ func init() {
func (self *BaremetalUnconvertHypervisorTask) OnInit(ctx context.Context, obj db.IStandaloneModel, body jsonutils.JSONObject) {
baremetal := obj.(*models.SHost)
baremetal.SetStatus(self.UserCred, api.BAREMETAL_CONVERTING, "")
guests := baremetal.GetGuests()
guests, err := baremetal.GetGuests()
if err != nil {
self.SetStageFailed(ctx, jsonutils.NewString(errors.Wrapf(err, "baremetal.GetGuests").Error()))
return
}
if len(guests) > 1 {
self.SetStageFailed(ctx, jsonutils.NewString("Host guest conut > 1"))
return
}
if len(guests) == 1 {
guest := guests[0]