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 #4714 from wanyaoqi/bugfix/wyq/subimage-field-nullable

Browse Source 
bugfix: glance set subimage some field nullable
This commit is contained in:
Zexi Li
2020-01-08 15:42:33 +08:00
committed by GitHub
parent 77ca8b147b 00237495b9
commit 899f90f60b
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/image/models/image_subs.go
+3 -3
View File
@@ -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"`
pkg/image/models/images.go
+1 -1
View File
@@ -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
pkg/image/tasks/image_probe_task.go
+8 -2
View File
@@ -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)