From 00237495b953a143fb55ab6e0e5b7b0e357c88ea Mon Sep 17 00:00:00 2001 From: wanyaoqi Date: Wed, 8 Jan 2020 15:35:26 +0800 Subject: [PATCH] set subimage some field nullable --- pkg/image/models/image_subs.go | 6 +++--- pkg/image/models/images.go | 2 +- pkg/image/tasks/image_probe_task.go | 10 ++++++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/pkg/image/models/image_subs.go b/pkg/image/models/image_subs.go index 0d7f5767f4..ac151de5b3 100644 --- a/pkg/image/models/image_subs.go +++ b/pkg/image/models/image_subs.go @@ -56,13 +56,13 @@ type SImageSubformat struct { Format string `width:"20" charset:"ascii" nullable:"true"` - Size int64 `nullable:"false"` - Location string `nullable:"false"` + Size int64 `nullable:"true"` + Location string `nullable:"true"` Checksum string `width:"32" charset:"ascii" nullable:"true"` FastHash string `width:"32" charset:"ascii" nullable:"true"` Status string `nullable:"false"` - TorrentSize int64 `nullable:"false"` + TorrentSize int64 `nullable:"true"` TorrentLocation string `nullable:"true"` TorrentChecksum string `width:"32" charset:"ascii" nullable:"true"` TorrentStatus string `nullable:"false"` diff --git a/pkg/image/models/images.go b/pkg/image/models/images.go index 6bde0a5323..d136ac5722 100644 --- a/pkg/image/models/images.go +++ b/pkg/image/models/images.go @@ -934,7 +934,7 @@ func (self *SImage) newSubformat(format qemuimg.TImageFormat, migrate bool) erro err := ImageSubformatManager.TableSpec().Insert(subformat) if err != nil { - log.Errorf("fail to make subformat %s", format) + log.Errorf("fail to make subformat %s: %s", format, err) return err } return nil diff --git a/pkg/image/tasks/image_probe_task.go b/pkg/image/tasks/image_probe_task.go index f9e3cbc077..252584ea68 100644 --- a/pkg/image/tasks/image_probe_task.go +++ b/pkg/image/tasks/image_probe_task.go @@ -171,7 +171,10 @@ func (self *ImageProbeTask) OnProbeFailed(ctx context.Context, image *models.SIm if jsonutils.QueryBoolean(self.Params, "do_convert", false) { self.SetStage("OnConvertComplete", nil) - image.StartImageConvertTask(ctx, self.UserCred, self.GetId()) + if err := image.StartImageConvertTask(ctx, self.UserCred, self.GetId()); err != nil { + image.SetStatus(self.UserCred, api.IMAGE_STATUS_ACTIVE, "") + self.SetStageFailed(ctx, err.Error()) + } } else { image.SetStatus(self.UserCred, api.IMAGE_STATUS_ACTIVE, "") self.SetStageFailed(ctx, reason) @@ -186,7 +189,10 @@ func (self *ImageProbeTask) OnProbeSuccess(ctx context.Context, image *models.SI if jsonutils.QueryBoolean(self.Params, "do_convert", false) { self.SetStage("OnConvertComplete", nil) - image.StartImageConvertTask(ctx, self.UserCred, self.GetId()) + if err := image.StartImageConvertTask(ctx, self.UserCred, self.GetId()); err != nil { + image.SetStatus(self.UserCred, api.IMAGE_STATUS_ACTIVE, "") + self.SetStageFailed(ctx, err.Error()) + } } else { image.SetStatus(self.UserCred, api.IMAGE_STATUS_ACTIVE, "") self.SetStageComplete(ctx, nil)