fix(region): remove metadata (#14214)

This commit is contained in:
屈轩
2022-05-07 20:07:24 +08:00
committed by GitHub
parent 565ae863d8
commit caeea77878
2 changed files with 6 additions and 11 deletions
+6
View File
@@ -1726,6 +1726,12 @@ func DeleteModel(ctx context.Context, userCred mcclient.TokenCredential, item IM
if userCred != nil {
OpsLog.LogEvent(item, ACT_DELETE, item.GetShortDesc(ctx), userCred)
}
if _, ok := item.(IStandaloneModel); ok && len(item.GetId()) > 0 {
err := Metadata.RemoveAll(ctx, item, userCred)
if err != nil {
return errors.Wrapf(err, "Metadata.RemoveAll")
}
}
return nil
}
-11
View File
@@ -585,17 +585,6 @@ func (model *SStandaloneAnonResourceBase) applyPolicyTags(ctx context.Context, u
}
}
func (model *SStandaloneAnonResourceBase) PostDelete(ctx context.Context, userCred mcclient.TokenCredential) {
if model.Deleted {
model.RemoveAllMetadata(ctx, userCred)
}
model.SResourceBase.PostDelete(ctx, userCred)
}
// func (model *SStandaloneAnonResourceBase) Delete(ctx context.Context, userCred mcclient.TokenCredential) error {
// return DeleteModel(ctx, userCred, model)
// }
func (model *SStandaloneAnonResourceBase) ClearSchedDescCache() error {
return nil
}