]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: preserve all attrs if intra-zone copy 5863/head
authorYehuda Sadeh <yehuda@redhat.com>
Wed, 9 Sep 2015 22:41:02 +0000 (15:41 -0700)
committerYehuda Sadeh <yehuda@redhat.com>
Wed, 9 Sep 2015 22:43:55 +0000 (15:43 -0700)
Fixes: #13015
Intra zone copy requires that all objects' attributes are preserved.
This was broken at commit: e41d97c8e38bb60d7e09e9801c0179efe7af1734

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
src/rgw/rgw_rados.cc

index c23a2db3ee7f086cbd548049838c081f20a3165e..8c6418201c14aa4fd096f1cc57214c3b05b57288 100644 (file)
@@ -3885,6 +3885,8 @@ int RGWRados::fetch_remote_obj(RGWObjectCtx& obj_ctx,
 
   if (source_zone.empty()) {
     set_copy_attrs(src_attrs, attrs, attrs_mod);
+  } else {
+    attrs = src_attrs;
   }
 
   ret = cb.complete(etag, mtime, set_mtime, attrs);