From f262783db644e2f48afaa147acb5f26cf9059267 Mon Sep 17 00:00:00 2001 From: Qiu Jian Date: Thu, 13 Dec 2018 12:18:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E6=97=B6=E5=BF=BD=E7=95=A5rebuild=20d?= =?UTF-8?q?ata=20disk=E7=9A=84=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/compute/models/guests.go | 2 +- pkg/compute/tasks/guest_rebuild_root_task.go | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pkg/compute/models/guests.go b/pkg/compute/models/guests.go index 4a4003943e..4daebf3ffc 100644 --- a/pkg/compute/models/guests.go +++ b/pkg/compute/models/guests.go @@ -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 { diff --git a/pkg/compute/tasks/guest_rebuild_root_task.go b/pkg/compute/tasks/guest_rebuild_root_task.go index b19ae818b5..627e52354f 100644 --- a/pkg/compute/tasks/guest_rebuild_root_task.go +++ b/pkg/compute/tasks/guest_rebuild_root_task.go @@ -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) {