From 3626db4f2fb5ff1136826c91f5ded57a7c7303d3 Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Wed, 2 Sep 2015 17:56:07 -0700 Subject: [PATCH] rgw: don't copy delete_at attr, unless it's intra region copy We don't want to keep the expiration value of a copied object, unless we're doing a copy within the same zone group. Signed-off-by: Yehuda Sadeh --- src/rgw/rgw_rados.cc | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index 3ff74e4598ce..ae9d64fc6c9b 100644 --- a/src/rgw/rgw_rados.cc +++ b/src/rgw/rgw_rados.cc @@ -4024,6 +4024,20 @@ int RGWRados::fetch_remote_obj(RGWObjectCtx& obj_ctx, JSONDecoder::decode_json("attrs", src_attrs, &jp); src_attrs.erase(RGW_ATTR_MANIFEST); // not interested in original object layout + if (source_zone.empty()) { /* need to preserve expiration if copy in the same zonegroup */ + src_attrs.erase(RGW_ATTR_DELETE_AT); + } else { + map::iterator iter = src_attrs.find(RGW_ATTR_DELETE_AT); + if (iter != src_attrs.end()) { + try { + utime_t da; + ::decode(da, iter->second); + delete_at = (time_t)da.sec(); + } catch (buffer::error& err) { + ldout(cct, 0) << "ERROR: failed to decode delete_at field in intra zone copy" << dendl; + } + } + } } } @@ -4182,6 +4196,7 @@ int RGWRados::copy_obj(RGWObjectCtx& obj_ctx, } src_attrs[RGW_ATTR_ACL] = attrs[RGW_ATTR_ACL]; + src_attrs.erase(RGW_ATTR_DELETE_AT); set_copy_attrs(src_attrs, attrs, attrs_mod); attrs.erase(RGW_ATTR_ID_TAG); -- 2.47.3