From: Casey Bodley <cbodley@users.noreply.github.com>
Date: Tue, 30 May 2017 18:16:07 +0000 (-0400)
Subject: Merge pull request #13851 from zhangsw/optimize-datasync
X-Git-Tag: v12.1.0~87^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6049d977401dcbb3f362a8fc708a4bc89555ed11;p=ceph.git

Merge pull request #13851 from zhangsw/optimize-datasync

rgw: optimize data sync. Add zones_trace in log to avoid needless sync.

Reviewed-by: Casey Bodley <cbodley@redhat.com>
---

6049d977401dcbb3f362a8fc708a4bc89555ed11
diff --cc src/rgw/rgw_cr_rados.cc
index 0e0be84c82c,c4e4b0be28f..1dce7ed211a
--- a/src/rgw/rgw_cr_rados.cc
+++ b/src/rgw/rgw_cr_rados.cc
@@@ -541,8 -541,10 +541,9 @@@ int RGWAsyncFetchRemoteObj::_send_reque
                         &key.instance, /* string *version_id, */
                         NULL, /* string *ptag, */
                         NULL, /* string *petag, */
 -                       NULL, /* struct rgw_err *err, */
                         NULL, /* void (*progress_cb)(off_t, void *), */
-                        NULL); /* void *progress_data*); */
+                        NULL, /* void *progress_data*); */
+                        zones_trace); 
  
    if (r < 0) {
      ldout(store->ctx(), 0) << "store->fetch_remote_obj() returned r=" << r << dendl;
diff --cc src/rgw/rgw_rados.cc
index 41aafabf258,59f36f9f939..07e5fdb7603
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@@ -7225,8 -7229,10 +7229,9 @@@ int RGWRados::fetch_remote_obj(RGWObjec
                 string *version_id,
                 string *ptag,
                 ceph::buffer::list *petag,
 -               struct rgw_err *err,
                 void (*progress_cb)(off_t, void *),
-                void *progress_data)
+                void *progress_data,
+                rgw_zone_set *zones_trace)
  {
    /* source is in a different zonegroup, copy from there */
  
diff --cc src/rgw/rgw_rados.h
index 6a33ee8c2d3,d0ab92b8142..6e0cca14c16
--- a/src/rgw/rgw_rados.h
+++ b/src/rgw/rgw_rados.h
@@@ -3021,8 -3030,10 +3028,9 @@@ public
                         string *version_id,
                         string *ptag,
                         ceph::buffer::list *petag,
 -                       struct rgw_err *err,
                         void (*progress_cb)(off_t, void *),
-                        void *progress_data);
+                        void *progress_data,
+                        rgw_zone_set *zones_trace= nullptr);
    /**
     * Copy an object.
     * dest_obj: the object to copy into