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

冲突解决

Browse Source
This commit is contained in:
屈轩
2018-12-05 14:42:16 +08:00
parent 4b41872376
commit 05ebba4ab6
6 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/tasks/disk_resize_task.go
+4 -3
View File
@@ -107,8 +107,9 @@ func (self *DiskResizeTask) OnDiskResizeComplete(ctx context.Context, disk *mode
self.finalReleasePendingUsage(ctx)
}
func (self *DiskResizeTask) OnDiskResizeCompleteFailed(ctx context.Context, disk *models.SDisk, reason error) {
disk.SetDiskReady(ctx, self.GetUserCred(), reason.Error())
func (self *DiskResizeTask) OnDiskResizeCompleteFailed(ctx context.Context, disk *models.SDisk, data jsonutils.JSONObject) {
disk.SetDiskReady(ctx, self.GetUserCred(), data.String())
db.OpsLog.LogEvent(disk, db.ACT_RESIZE_FAIL, disk.GetShortDesc(), self.UserCred)
logclient.AddActionLog(disk, logclient.ACT_RESIZE, reason.Error(), self.UserCred, false)
logclient.AddActionLog(disk, logclient.ACT_RESIZE, data.String(), self.UserCred, false)
self.SetStageFailed(ctx, data.String())
}
pkg/compute/tasks/disk_save_task.go
+1
View File
@@ -66,6 +66,7 @@ func (self *DiskSaveTask) StartBackupDisk(ctx context.Context, disk *models.SDis
func (self *DiskSaveTask) OnDiskBackupCompleteFailed(ctx context.Context, disk *models.SDisk, data jsonutils.JSONObject) {
disk.SetDiskReady(ctx, self.GetUserCred(), data.String())
db.OpsLog.LogEvent(disk, db.ACT_SAVE_FAIL, data.String(), self.GetUserCred())
self.SetStageFailed(ctx, data.String())
}
func (self *DiskSaveTask) OnDiskBackupComplete(ctx context.Context, disk *models.SDisk, data *jsonutils.JSONDict) {
pkg/compute/tasks/guest_deploy_task.go
+9
View File
@@ -99,12 +99,21 @@ func (self *GuestDeployTask) OnDeployGuestComplete(ctx context.Context, obj db.I
func (self *GuestDeployTask) OnDeployGuestCompleteFailed(ctx context.Context, obj db.IStandaloneModel, data jsonutils.JSONObject) {
guest := obj.(*models.SGuest)
guest.SetStatus(self.UserCred, models.VM_DEPLOY_FAILED, data.String())
self.SetStageFailed(ctx, data.String())
}
func (self *GuestDeployTask) OnDeployStartGuestComplete(ctx context.Context, obj db.IStandaloneModel, data jsonutils.JSONObject) {
self.SetStageComplete(ctx, nil)
}
func (self *GuestDeployTask) OnDeployStartGuestCompleteFailed(ctx context.Context, obj db.IStandaloneModel, data jsonutils.JSONObject) {
self.SetStageFailed(ctx, data.String())
}
func (self *GuestDeployTask) OnDeployGuestSyncstatusComplete(ctx context.Context, obj db.IStandaloneModel, data jsonutils.JSONObject) {
self.SetStageComplete(ctx, nil)
}
func (self *GuestDeployTask) OnDeployGuestSyncstatusCompleteFailed(ctx context.Context, obj db.IStandaloneModel, data jsonutils.JSONObject) {
self.SetStageFailed(ctx, data.String())
}
pkg/compute/tasks/guest_rebuild_root_task.go
+1
View File
@@ -111,6 +111,7 @@ func (self *GuestRebuildRootTask) OnRebuildRootDiskCompleteFailed(ctx context.Co
db.OpsLog.LogEvent(guest, db.ACT_REBUILD_ROOT_FAIL, data, self.UserCred)
guest.SetStatus(self.UserCred, models.VM_REBUILD_ROOT_FAIL, "")
logclient.AddActionLog(guest, logclient.ACT_VM_REBUILD, data, self.UserCred, false)
self.SetStageFailed(ctx, data.String())
}
func (self *GuestRebuildRootTask) OnSyncStatusComplete(ctx context.Context, guest *models.SGuest, data jsonutils.JSONObject) {
pkg/compute/tasks/guest_start_task.go
+3 -7
View File
@@ -45,7 +45,7 @@ func (self *GuestStartTask) startStart(ctx context.Context, guest *models.SGuest
guest.SetStatus(self.UserCred, models.VM_STARTING, "")
result, err := guest.GetDriver().RequestStartOnHost(ctx, guest, host, self.UserCred, self)
if err != nil {
self.onStartGuestFailed(ctx, guest, err)
self.OnStartCompleteFailed(ctx, guest, jsonutils.NewString(err.Error()))
} else {
if result != nil && jsonutils.QueryBoolean(result, "is_running", false) {
guest.SetStatus(self.UserCred, models.VM_RUNNING, "start")
@@ -70,14 +70,10 @@ func (self *GuestStartTask) OnGuestSyncstatusAfterStart(ctx context.Context, obj
func (self *GuestStartTask) OnStartCompleteFailed(ctx context.Context, obj db.IStandaloneModel, err jsonutils.JSONObject) {
guest := obj.(*models.SGuest)
guest.SetStatus(self.UserCred, models.VM_START_FAILED, err.String())
db.OpsLog.LogEvent(guest, db.ACT_START_FAIL, err, self.UserCred)
}
func (self *GuestStartTask) onStartGuestFailed(ctx context.Context, guest *models.SGuest, err error) {
guest.SetStatus(self.UserCred, models.VM_START_FAILED, err.Error())
self.SetStageFailed(ctx, err.Error())
self.OnStartCompleteFailed(ctx, guest, jsonutils.NewString(err.Error()))
logclient.AddActionLog(guest, logclient.ACT_VM_START, err, self.UserCred, false)
self.SetStageFailed(ctx, err.String())
}
func (self *GuestStartTask) taskComplete(ctx context.Context, guest *models.SGuest) {
pkg/compute/tasks/guest_suspend_task.go
+1
View File
@@ -40,6 +40,7 @@ func (self *GuestSuspendTask) OnSuspendCompleteFailed(ctx context.Context, obj d
guest := obj.(*models.SGuest)
guest.SetStatus(self.UserCred, models.VM_RUNNING, "")
db.OpsLog.LogEvent(guest, db.ACT_STOP_FAIL, err.String(), self.UserCred)
self.SetStageFailed(ctx, err.String())
}
func (self *GuestSuspendTask) OnSuspendGuestFail(guest *models.SGuest, reason string) {