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

- fix image status on upload failed

Browse Source 
- fix init nbd
This commit is contained in:
wanyaoqi
2019-05-29 18:29:54 +08:00
parent f946320b2f
commit 86095c713f
4 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/glance/root/opt/yunion/share/notify_templates/glance/content/IMAGE_ACTIVED → build/glance/root/opt/yunion/share/notify_templates/image/content/IMAGE_ACTIVED
View File
build/glance/root/opt/yunion/share/notify_templates/glance/title/IMAGE_ACTIVED → build/glance/root/opt/yunion/share/notify_templates/image/title/IMAGE_ACTIVED
View File
pkg/image/models/images.go
+1 -1
View File
@@ -370,7 +370,7 @@ func (self *SImage) saveSuccess(userCred mcclient.TokenCredential, msg string) {
func (self *SImage) saveFailed(userCred mcclient.TokenCredential, msg string) {
log.Errorf(msg)
self.SetStatus(userCred, api.IMAGE_STATUS_QUEUED, msg)
self.SetStatus(userCred, api.IMAGE_STATUS_KILLED, msg)
db.OpsLog.LogEvent(self, db.ACT_SAVE_FAIL, msg, userCred)
}
pkg/image/service/service.go
+3
View File
@@ -28,6 +28,7 @@ import (
"yunion.io/x/onecloud/pkg/cloudcommon/cronman"
"yunion.io/x/onecloud/pkg/cloudcommon/db"
common_options "yunion.io/x/onecloud/pkg/cloudcommon/options"
"yunion.io/x/onecloud/pkg/hostman/storageman/nbd"
"yunion.io/x/onecloud/pkg/image/models"
"yunion.io/x/onecloud/pkg/image/options"
_ "yunion.io/x/onecloud/pkg/image/tasks"
@@ -103,6 +104,8 @@ func StartService() {
go models.CheckImages()
nbd.Init() // init nbd module for image probe
cron := cronman.GetCronJobManager(true)
cron.AddJob1("CleanPendingDeleteImages", time.Duration(options.Options.PendingDeleteCheckSeconds)*time.Second, models.ImageManager.CleanPendingDeleteImages)