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 #751 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-ignore-data-disk-rebuild-failure to release/2.4.0

Browse Source 
* commit 'f262783db644e2f48afaa147acb5f26cf9059267':
  暂时忽略rebuild data disk的错误
This commit is contained in:
邱剑
2018-12-13 18:38:57 +08:00
parent 0d32748db8 f262783db6
commit e08c511bb4
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/guests.go
+1 -1
View File
@@ -2441,7 +2441,7 @@ func (self *SGuest) createDiskOnHost(ctx context.Context, userCred mcclient.Toke
diskConfig *SDiskConfig, pendingUsage quotas.IQuota, inheritBilling bool) (*SDisk, error) {
storage := self.GetDriver().ChooseHostStorage(host, diskConfig.Backend)
if storage == nil {
return nil, fmt.Errorf("No storage to create disk")
return nil, fmt.Errorf("No storage on %s to create disk for %s", host.GetName(), diskConfig.Backend)
}
disk, err := self.createDiskOnStorage(ctx, userCred, storage, diskConfig, pendingUsage, inheritBilling)
if err != nil {
pkg/compute/tasks/guest_rebuild_root_task.go
+8 -4
View File
@@ -106,10 +106,14 @@ func (self *GuestRebuildRootTask) OnRebuildingDataDisksComplete(ctx context.Cont
}
func (self *GuestRebuildRootTask) OnRebuildingDataDisksCompleteFailed(ctx context.Context, guest *models.SGuest, data jsonutils.JSONObject) {
db.OpsLog.LogEvent(guest, db.ACT_REBUILD_ROOT_FAIL, data, self.UserCred)
guest.SetStatus(self.UserCred, models.VM_REBUILD_ROOT_FAIL, "OnRebuildingDataDisksCompleteFailed")
logclient.AddActionLog(guest, logclient.ACT_VM_REBUILD, data, self.UserCred, false)
self.SetStageFailed(ctx, data.String())
/*
XXX ignore rebuild data disk errors
db.OpsLog.LogEvent(guest, db.ACT_REBUILD_ROOT_FAIL, data, self.UserCred)
guest.SetStatus(self.UserCred, models.VM_REBUILD_ROOT_FAIL, "OnRebuildingDataDisksCompleteFailed")
logclient.AddActionLog(guest, logclient.ACT_VM_REBUILD, data, self.UserCred, false)
self.SetStageFailed(ctx, data.String())
*/
self.OnRebuildAllDisksComplete(ctx, guest, data)
}
func (self *GuestRebuildRootTask) OnRebuildAllDisksComplete(ctx context.Context, guest *models.SGuest, data jsonutils.JSONObject) {