From: Prasad Krishnan <prasad.krishnan@flipkart.com>
Date: Thu, 19 Mar 2020 01:25:13 +0000 (+0000)
Subject: RGW:Multisite: Rename rgw_sync_obj_integrity to rgw_sync_obj_etag_verify
X-Git-Tag: v14.2.17~32^2~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b69eba79e9e1aed40156039b62bdf1190d85b378;p=ceph.git

RGW:Multisite: Rename rgw_sync_obj_integrity to rgw_sync_obj_etag_verify

Signed-off-by: Prasad Krishnan <prasad.krishnan@flipkart.com>
(cherry picked from commit 6c4262bfa7d54563ea8bf616154a6b3491d59347)
---

diff --git a/src/common/legacy_config_opts.h b/src/common/legacy_config_opts.h
index 45ea483a015..430ef684848 100644
--- a/src/common/legacy_config_opts.h
+++ b/src/common/legacy_config_opts.h
@@ -1476,7 +1476,7 @@ OPTION(rgw_curl_low_speed_limit, OPT_INT) // low speed limit for certain curl ca
 OPTION(rgw_curl_low_speed_time, OPT_INT) // low speed time for certain curl calls
 OPTION(rgw_copy_obj_progress, OPT_BOOL) // should dump progress during long copy operations?
 OPTION(rgw_copy_obj_progress_every_bytes, OPT_INT) // min bytes between copy progress output
-OPTION(rgw_sync_obj_integrity, OPT_BOOL) // verify if the copied object from remote is identical to source
+OPTION(rgw_sync_obj_etag_verify, OPT_BOOL) // verify if the copied object from remote is identical to source
 OPTION(rgw_obj_tombstone_cache_size, OPT_INT) // how many objects in tombstone cache, which is used in multi-zone sync to keep
                                                     // track of removed objects' mtime
 
diff --git a/src/common/options.cc b/src/common/options.cc
index 3d7f0a6678e..de7c9939c9c 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -6643,7 +6643,7 @@ std::vector<Option> get_rgw_options() {
     .set_default(1_M)
     .set_description("Send copy-object progress info after these many bytes"),
 
-    Option("rgw_sync_obj_integrity", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
+    Option("rgw_sync_obj_etag_verify", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
     .set_default(false)
     .set_description("Verify if the object copied from remote is identical to its source")
     .set_long_description(
diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index b5619c74d60..c30a64996ab 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -4001,7 +4001,7 @@ public:
      * requested. We can enable simultaneous support once we have a mechanism
      * to know the sequence in which the filters must be applied.
      */
-    if (cct->_conf->rgw_sync_obj_integrity &&
+    if (cct->_conf->rgw_sync_obj_etag_verify &&
         src_attrs.find(RGW_ATTR_CRYPT_MODE) == src_attrs.end()) {
 
       RGWObjManifest manifest;
@@ -4114,7 +4114,7 @@ public:
   }
 
   string get_calculated_etag() {
-    if (!cct->_conf->rgw_sync_obj_integrity)
+    if (!cct->_conf->rgw_sync_obj_etag_verify)
       return "";
 
     if (is_mpu_obj) {
@@ -4607,7 +4607,7 @@ int RGWRados::fetch_remote_obj(RGWObjectCtx& obj_ctx,
     set_mtime_weight.init(set_mtime, svc.zone->get_zone_short_id(), pg_ver);
   }
 
-  if (cct->_conf->rgw_sync_obj_integrity) {
+  if (cct->_conf->rgw_sync_obj_etag_verify) {
     string trimmed_etag = etag;
 
     /* Remove the leading and trailing double quotes from etag */