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

elastic cache task bugfix

Browse Source
This commit is contained in:
TangBin
2019-12-03 20:25:46 +08:00
parent be45ce1cf2
commit 7c2ccb6088
6 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/regiondrivers/managedvirtual.go
+4
View File
@@ -2383,6 +2383,10 @@ func (self *SManagedVirtualizationRegionDriver) RequestDeleteElasticcacheAcl(ctx
iea, err := iec.GetICloudElasticcacheAcl(ea.GetExternalId())
if err != nil {
if err == cloudprovider.ErrNotFound {
return nil
}
return errors.Wrap(err, "managedVirtualizationRegionDriver.RequestDeleteElasticcacheAcl.GetICloudElasticcacheAccount")
}
pkg/compute/tasks/elasticcache_account_create_task.go
+2 -2
View File
@@ -64,6 +64,6 @@ func (self *ElasticcacheAccountCreateTask) OnElasticcacheAccountCreateComplete(c
self.SetStageComplete(ctx, nil)
}
func (self *ElasticcacheAccountCreateTask) OnElasticcacheAccountCreateCompleteFailed(ctx context.Context, ea *models.SElasticcacheAccount, reason string) {
self.taskFail(ctx, ea, reason)
func (self *ElasticcacheAccountCreateTask) OnElasticcacheAccountCreateCompleteFailed(ctx context.Context, ea *models.SElasticcacheAccount, data jsonutils.JSONObject) {
self.taskFail(ctx, ea, data.String())
}
pkg/compute/tasks/elasticcache_acl_create_task.go
+2 -2
View File
@@ -63,6 +63,6 @@ func (self *ElasticcacheAclCreateTask) OnElasticcacheAclCreateComplete(ctx conte
self.SetStageComplete(ctx, nil)
}
func (self *ElasticcacheAclCreateTask) OnElasticcacheAclCreateCompleteFailed(ctx context.Context, ea *models.SElasticcacheAcl, reason string) {
self.taskFail(ctx, ea, reason)
func (self *ElasticcacheAclCreateTask) OnElasticcacheAclCreateCompleteFailed(ctx context.Context, ea *models.SElasticcacheAcl, data jsonutils.JSONObject) {
self.taskFail(ctx, ea, data.String())
}
pkg/compute/tasks/elasticcache_acl_update_task.go
+2 -2
View File
@@ -63,6 +63,6 @@ func (self *ElasticcacheAclUpdateTask) OnElasticcacheAclUpdateComplete(ctx conte
self.SetStageComplete(ctx, nil)
}
func (self *ElasticcacheAclUpdateTask) OnElasticcacheAclUpdateCompleteFailed(ctx context.Context, ea *models.SElasticcacheAcl, reason string) {
self.taskFail(ctx, ea, reason)
func (self *ElasticcacheAclUpdateTask) OnElasticcacheAclUpdateCompleteFailed(ctx context.Context, ea *models.SElasticcacheAcl, data jsonutils.JSONObject) {
self.taskFail(ctx, ea, data.String())
}
pkg/compute/tasks/elasticcache_backup_create_task.go
+2 -2
View File
@@ -64,6 +64,6 @@ func (self *ElasticcacheBackupCreateTask) OnElasticcacheBackupCreateComplete(ctx
self.SetStageComplete(ctx, nil)
}
func (self *ElasticcacheBackupCreateTask) OnElasticcacheBackupCreateCompleteFailed(ctx context.Context, eb *models.SElasticcacheBackup, reason string) {
self.taskFail(ctx, eb, reason)
func (self *ElasticcacheBackupCreateTask) OnElasticcacheBackupCreateCompleteFailed(ctx context.Context, eb *models.SElasticcacheBackup, data jsonutils.JSONObject) {
self.taskFail(ctx, eb, data.String())
}
pkg/compute/tasks/elasticcache_parameter_update_task.go
+3 -1
View File
@@ -59,9 +59,11 @@ func (self *ElasticcacheParameterUpdateTask) OnInit(ctx context.Context, obj db.
self.SetStage("OnElasticcacheParameterUpdateComplete", nil)
if err := region.GetDriver().RequestElasticcacheUpdateInstanceParameters(ctx, self.GetUserCred(), iec.(*models.SElasticcache), self); err != nil {
self.taskFail(ctx, ep, err.Error())
self.OnElasticcacheParameterUpdateCompleteFailed(ctx, ep, err.Error())
return
}
self.OnElasticcacheParameterUpdateComplete(ctx, ep, data)
}
func (self *ElasticcacheParameterUpdateTask) OnElasticcacheParameterUpdateComplete(ctx context.Context, ep *models.SElasticcacheParameter, data jsonutils.JSONObject) {