Merge pull request #17305 from theanalyst/rgw-lc-tagging

RGW: support for tagging in lifecycle policies

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
Reviewed-by: Adam Emerson <aemerson@redhat.com>

diff --cc src/rgw/rgw_lc.cc
index f7abd2fcd3f987cf27737a92d3b3dfe7ff7e31ed,38e5c811aeedabeae6cdbef81e9cf341db7a087d..0e99b1dc25ee2dbfe550987ee59b33470b151d8f
--- 1/src/rgw/rgw_lc.cc
--- 2/src/rgw/rgw_lc.cc
+++ b/src/rgw/rgw_lc.cc
@@@ -398,12 -437,9 +439,9 @@@ int RGWLC::bucket_lc_process(string& sh
              //we have checked it before
              is_expired = true;
            } else {
 -            is_expired = obj_has_expired(now - ceph::real_clock::to_time_t(obj_iter->meta.mtime), prefix_iter->second.expiration);
 +            is_expired = obj_has_expired(obj_iter->meta.mtime, prefix_iter->second.expiration);
            }
            if (is_expired) {
-             RGWObjectCtx rctx(store);
-             rgw_obj obj(bucket_info.bucket, key);
-             RGWObjState *state;
              int ret = store->get_obj_state(&rctx, bucket_info, obj, &state, false);
              if (ret < 0) {
                return ret;

diff --cc src/rgw/rgw_lc.h
Simple merge

diff --cc src/rgw/rgw_lc_s3.cc
Simple merge