From: Casey Bodley <cbodley@users.noreply.github.com>
Date: Mon, 28 Jan 2019 14:33:52 +0000 (-0500)
Subject: Merge pull request #25794 from cbodley/wip-rgw-sync-olh-attrs
X-Git-Tag: v14.1.0~270
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=1c1d3d9642437e953f8a23026ad3ab74833e8f3e;p=ceph-ci.git

Merge pull request #25794 from cbodley/wip-rgw-sync-olh-attrs

rgw: fetch_remote_obj filters out olh attrs

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Reviewed-by: Mark Kogan <mkogan@redhat.com>
---

1c1d3d9642437e953f8a23026ad3ab74833e8f3e
diff --cc src/rgw/rgw_rados.cc
index b2627f41286,d71dcfb988f..6d85671b163
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@@ -3873,13 -3832,17 +3873,22 @@@ public
  
        src_attrs.erase(RGW_ATTR_COMPRESSION);
        src_attrs.erase(RGW_ATTR_MANIFEST); // not interested in original object layout
+ 
+       // filter out olh attributes
+       auto iter = src_attrs.lower_bound(RGW_ATTR_OLH_PREFIX);
+       while (iter != src_attrs.end()) {
+         if (!boost::algorithm::starts_with(iter->first, RGW_ATTR_OLH_PREFIX)) {
+           break;
+         }
+         iter = src_attrs.erase(iter);
+       }
      }
  
 +    int ret = attrs_handler(src_attrs);
 +    if (ret < 0) {
 +      return ret;
 +    }
 +
      if (plugin && src_attrs.find(RGW_ATTR_CRYPT_MODE) == src_attrs.end()) {
        //do not compress if object is encrypted
        compressor = boost::in_place(cct, plugin, filter);