From cc1e812a003e2af74fe0c69ccae08dd7aa68bbe0 Mon Sep 17 00:00:00 2001 From: Matt Benjamin Date: Tue, 4 Jan 2022 11:22:00 -0500 Subject: [PATCH] rgwlc: remove lc entry on bucket delete Buckets with lifecycle policies installed have a state entry that must also be deleted when the bucket is removed. Fixes: https://tracker.ceph.com/issues/46728 N.b., should really be generic, not specific to the RADOS store, but there doesn't seem to be a clean model for implementing generic side effects in Zipper, currently. Signed-off-by: Matt Benjamin --- src/rgw/rgw_sal_rados.cc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/rgw/rgw_sal_rados.cc b/src/rgw/rgw_sal_rados.cc index 128fb984351dc..17ee63b2f0a26 100644 --- a/src/rgw/rgw_sal_rados.cc +++ b/src/rgw/rgw_sal_rados.cc @@ -34,6 +34,7 @@ #include "rgw_zone.h" #include "rgw_rest_conn.h" #include "rgw_service.h" +#include "rgw_lc.h" #include "services/svc_sys_obj.h" #include "services/svc_zone.h" #include "services/svc_tier_rados.h" @@ -390,6 +391,10 @@ int RadosBucket::remove_bucket(const DoutPrefixProvider* dpp, return ret; } + // remove lifecycle config, if any (XXX note could be made generic) + (void) store->getRados()->get_lc()->remove_bucket_config( + this, get_attrs()); + ret = store->ctl()->bucket->sync_user_stats(dpp, info.owner, info, y); if (ret < 0) { ldout(store->ctx(), 1) << "WARNING: failed sync user stats before bucket delete. ret=" << ret << dendl; -- 2.39.5