opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-31 19:14:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Automatic merge from release/2.4.0 -> release/2.5.0

Browse Source 
* commit '9e01cafeaec39f59011d227e3406181b26a3c38d':
  fix insert iso
This commit is contained in:
邱剑
2018-12-24 15:57:37 +08:00
parent 9b6ec1285b 9e01cafeae
commit ae56b3d72a
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/tasks/guest_insert_iso_task.go
+2 -5
View File
@@ -55,13 +55,10 @@ func (self *GuestInsertIsoTask) OnIsoPrepareCompleteFailed(ctx context.Context,
func (self *GuestInsertIsoTask) OnIsoPrepareComplete(ctx context.Context, obj db.IStandaloneModel, data jsonutils.JSONObject) {
imageId, _ := data.GetString("image_id")
jSize, err := data.Get("size")
if err != nil {
self.SetStageFailed(ctx, err.Error())
}
size, err := jSize.Int()
size, err := data.Int("size")
if err != nil {
self.SetStageFailed(ctx, err.Error())
return
}
name, _ := data.GetString("name")
path, _ := data.GetString("path")
pkg/compute/tasks/storage_cache_image_task.go
+7 -6
View File
@@ -44,10 +44,7 @@ func (self *StorageCacheImageTask) OnInit(ctx context.Context, obj db.IStandalon
func (self *StorageCacheImageTask) OnImageCacheComplete(ctx context.Context, obj db.IStandaloneModel, data jsonutils.JSONObject) {
storageCache := obj.(*models.SStoragecache)
imageId, _ := self.Params.GetString("image_id")
scimg := models.StoragecachedimageManager.Register(ctx, self.UserCred, storageCache.Id, imageId)
extImgId, _ := data.GetString("image_id")
self.OnCacheSucc(ctx, storageCache, imageId, scimg, extImgId)
self.OnCacheSucc(ctx, storageCache, data.(*jsonutils.JSONDict))
}
func (self *StorageCacheImageTask) OnImageCacheCompleteFailed(ctx context.Context, obj db.IStandaloneModel, data jsonutils.JSONObject) {
@@ -71,12 +68,16 @@ func (self *StorageCacheImageTask) OnCacheFailed(ctx context.Context, cache *mod
self.SetStageFailed(ctx, err.Error())
}
func (self *StorageCacheImageTask) OnCacheSucc(ctx context.Context, cache *models.SStoragecache, imageId string, scimg *models.SStoragecachedimage, extImgId string) {
func (self *StorageCacheImageTask) OnCacheSucc(ctx context.Context, cache *models.SStoragecache, data *jsonutils.JSONDict) {
imageId, _ := self.Params.GetString("image_id")
scimg := models.StoragecachedimageManager.Register(ctx, self.UserCred, cache.Id, imageId)
extImgId, _ := data.GetString("image_id")
scimg.SetStatus(self.UserCred, models.CACHED_IMAGE_STATUS_READY, "cached")
if len(extImgId) > 0 && scimg.ExternalId != extImgId {
scimg.SetExternalId(extImgId)
}
models.CachedimageManager.ImageAddRefCount(imageId)
db.OpsLog.LogEvent(cache, db.ACT_CACHED_IMAGE, imageId, self.UserCred)
self.SetStageComplete(ctx, nil)
self.SetStageComplete(ctx, data)
}