fanhuadesenlinnn/cloudpods
1
0
Fork 0
mirror of https://hubproxy.babadafafafafa.cn/https://github.com/yunionio/cloudpods.git synced 2026-09-20 08:03:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3689 from tb365/automated-cherry-pick-of-#3687-upstream-release-2.12

Browse Source 
Automated cherry pick of #3687: elastic cache purge bugfix
This commit is contained in:
yunion-ci-robot
2019-11-15 15:56:21 +08:00
committed by GitHub
parent addfe349f1 4141bd2b7d
commit ea7aaa640a
6 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/compute/models/elasticcache_accounts.go
View File

@@ -394,3 +394,7 @@ func (self *SElasticcacheAccount) StartResetPasswordTask(ctx context.Context, us
task.ScheduleRun(nil)
return nil
}
func (self *SElasticcacheAccount) ValidatePurgeCondition(ctx context.Context) error {
return nil
}

4
pkg/compute/models/elasticcache_acls.go
View File

@@ -277,6 +277,10 @@ func (self *SElasticcacheAcl) ValidateDeleteCondition(ctx context.Context) error
return nil
}
func (self *SElasticcacheAcl) ValidatePurgeCondition(ctx context.Context) error {
return nil
}
func (self *SElasticcacheAcl) CustomizeDelete(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) error {
self.SetStatus(userCred, api.ELASTIC_CACHE_ACL_STATUS_DELETING, "")
return self.StartDeleteElasticcacheAclTask(ctx, userCred, jsonutils.NewDict(), "")

4
pkg/compute/models/elasticcache_backups.go
View File

@@ -323,5 +323,9 @@ func (self *SElasticcacheBackup) ValidateDeleteCondition(ctx context.Context) er
return httperrors.NewUnsupportOperationError("unsupport delete %s backups", api.CLOUD_PROVIDER_ALIYUN)
}
return self.ValidatePurgeCondition(ctx)
}
func (self *SElasticcacheBackup) ValidatePurgeCondition(ctx context.Context) error {
return nil
}

4
pkg/compute/models/elasticcache_instances.go
View File

@@ -684,6 +684,10 @@ func (self *SElasticcache) ValidateDeleteCondition(ctx context.Context) error {
return httperrors.NewInvalidStatusError("Elastic cache is locked, cannot delete")
}
return self.ValidatePurgeCondition(ctx)
}
func (self *SElasticcache) ValidatePurgeCondition(ctx context.Context) error {
return self.SVirtualResourceBase.ValidateDeleteCondition(ctx)
}

4
pkg/compute/models/elasticcache_parameters.go
View File

@@ -213,3 +213,7 @@ func (self *SElasticcacheParameter) StartUpdateElasticcacheParameterTask(ctx con
task.ScheduleRun(nil)
return nil
}
func (self *SElasticcacheParameter) ValidatePurgeCondition(ctx context.Context) error {
return nil
}

10
pkg/compute/models/purge.go
View File

@@ -1463,7 +1463,7 @@ func (instance *SElasticcacheAccount) purge(ctx context.Context, userCred mcclie
lockman.LockObject(ctx, instance)
defer lockman.ReleaseObject(ctx, instance)
err := instance.ValidateDeleteCondition(ctx)
err := instance.ValidatePurgeCondition(ctx)
if err != nil {
return err
}
@@ -1489,7 +1489,7 @@ func (instance *SElasticcacheAcl) purge(ctx context.Context, userCred mcclient.T
lockman.LockObject(ctx, instance)
defer lockman.ReleaseObject(ctx, instance)
err := instance.ValidateDeleteCondition(ctx)
err := instance.ValidatePurgeCondition(ctx)
if err != nil {
return err
}
@@ -1515,7 +1515,7 @@ func (instance *SElasticcacheBackup) purge(ctx context.Context, userCred mcclien
lockman.LockObject(ctx, instance)
defer lockman.ReleaseObject(ctx, instance)
err := instance.ValidateDeleteCondition(ctx)
err := instance.ValidatePurgeCondition(ctx)
if err != nil {
return err
}
@@ -1541,7 +1541,7 @@ func (instance *SElasticcacheParameter) purge(ctx context.Context, userCred mccl
lockman.LockObject(ctx, instance)
defer lockman.ReleaseObject(ctx, instance)
err := instance.ValidateDeleteCondition(ctx)
err := instance.ValidatePurgeCondition(ctx)
if err != nil {
return err
}
@@ -1572,7 +1572,7 @@ func (instance *SElasticcache) purge(ctx context.Context, userCred mcclient.Toke
return err
}
err = instance.ValidateDeleteCondition(ctx)
err = instance.ValidatePurgeCondition(ctx)
if err != nil {
return err
}