From: Orit Wasserman <owasserm@redhat.com>
Date: Thu, 10 Sep 2015 10:16:03 +0000 (+0200)
Subject: Merge pull request #5863 from ceph/wip-13015
X-Git-Tag: v9.1.0~170
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f00c243de93dc5c566003b54bfa1b158672b3fe7;p=ceph.git

Merge pull request #5863 from ceph/wip-13015

rgw: preserve all attrs if intra-zone copy
---

f00c243de93dc5c566003b54bfa1b158672b3fe7
diff --cc src/rgw/rgw_rados.cc
index 7b5b064cefa5,8c6418201c14..f8531840d5e4
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@@ -4058,9 -3885,11 +4058,11 @@@ int RGWRados::fetch_remote_obj(RGWObjec
  
    if (source_zone.empty()) {
      set_copy_attrs(src_attrs, attrs, attrs_mod);
+   } else {
+     attrs = src_attrs;
    }
  
 -  ret = cb.complete(etag, mtime, set_mtime, attrs);
 +  ret = cb.complete(etag, mtime, set_mtime, attrs, delete_at);
    if (ret < 0) {
      goto set_err_state;
    }