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

Automatic merge from release/2.4.0 -> release/2.5.0

Browse Source 
* commit '8d9f37af4a42398c48256b31516b178aa5543646':
  gofmt
  增加挂载磁盘、卸载磁盘日志
This commit is contained in:
邱剑
2019-01-14 21:24:13 +08:00
parent 55f5beb1cf 8d9f37af4a
commit f099e1cbd8
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/tasks/guest_attach_disk_task.go
+3
View File
@@ -10,6 +10,7 @@ import (
"yunion.io/x/onecloud/pkg/cloudcommon/db"
"yunion.io/x/onecloud/pkg/cloudcommon/db/taskman"
"yunion.io/x/onecloud/pkg/compute/models"
"yunion.io/x/onecloud/pkg/util/logclient"
)
type GuestAttachDiskTask struct {
@@ -62,6 +63,7 @@ func (self *GuestAttachDiskTask) OnSyncConfigComplete(ctx context.Context, guest
}
disk.SetStatus(self.UserCred, models.DISK_READY, "")
self.SetStageComplete(ctx, nil)
logclient.AddActionLog(guest, logclient.ACT_VM_ATTACH_DISK, nil, self.UserCred, true)
}
func (self *GuestAttachDiskTask) OnSyncConfigCompleteFailed(ctx context.Context, obj db.IStandaloneModel, resion jsonutils.JSONObject) {
@@ -86,4 +88,5 @@ func (self *GuestAttachDiskTask) OnTaskFail(ctx context.Context, guest *models.S
guest.SetStatus(self.UserCred, models.VM_ATTACH_DISK_FAILED, err.Error())
self.SetStageFailed(ctx, err.Error())
log.Errorf("Guest %s GuestAttachDiskTask failed %s", guest.Name, err.Error())
logclient.AddActionLog(guest, logclient.ACT_VM_ATTACH_DISK, err.Error(), self.UserCred, false)
}
pkg/compute/tasks/guest_detach_disk_task.go
+3
View File
@@ -11,6 +11,7 @@ import (
"yunion.io/x/onecloud/pkg/cloudcommon/db"
"yunion.io/x/onecloud/pkg/cloudcommon/db/taskman"
"yunion.io/x/onecloud/pkg/compute/models"
"yunion.io/x/onecloud/pkg/util/logclient"
)
type GuestDetachDiskTask struct {
@@ -91,6 +92,7 @@ func (self *GuestDetachDiskTask) OnSyncConfigComplete(ctx context.Context, guest
} else {
self.SetStageComplete(ctx, nil)
}
logclient.AddActionLog(guest, logclient.ACT_VM_DETACH_DISK, nil, self.UserCred, true)
}
func (self *GuestDetachDiskTask) OnSyncConfigCompleteFailed(ctx context.Context, obj db.IStandaloneModel, resion jsonutils.JSONObject) {
@@ -121,6 +123,7 @@ func (self *GuestDetachDiskTask) OnTaskFail(ctx context.Context, guest *models.S
guest.SetStatus(self.UserCred, models.VM_DETACH_DISK_FAILED, err.Error())
self.SetStageFailed(ctx, err.Error())
log.Errorf("Guest %s GuestDetachDiskTask failed %s", guest.Id, err.Error())
logclient.AddActionLog(guest, logclient.ACT_VM_DETACH_DISK, err.Error(), self.UserCred, false)
}
func (self *GuestDetachDiskTask) OnDiskDeleteComplete(ctx context.Context, obj db.IStandaloneModel, data jsonutils.JSONObject) {