From: Casey Bodley <cbodley@redhat.com>
Date: Wed, 15 Aug 2018 20:09:43 +0000 (-0400)
Subject: rgw: remove unused query for remote datalog info
X-Git-Tag: v12.2.9~46^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=812f25ff19ebb9202683fc105dcb1326131dcceb;p=ceph.git

rgw: remove unused query for remote datalog info

Fixes: http://tracker.ceph.com/issues/26952

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit a543df729a6ca415648678e2ae2ed46eceaba086)
Signed-off-by: Jonathan Brielmaier <jbrielmaier@suse.de>

Conflicts:
	src/rgw/rgw_data_sync.cc: adapt to ldout, as there is no tn->log
---

diff --git a/src/rgw/rgw_data_sync.cc b/src/rgw/rgw_data_sync.cc
index 00dff5e26859..ff44e855c636 100644
--- a/src/rgw/rgw_data_sync.cc
+++ b/src/rgw/rgw_data_sync.cc
@@ -1112,9 +1112,6 @@ class RGWDataSyncShardCR : public RGWCoroutine {
   list<rgw_data_change_log_entry>::iterator log_iter;
   bool truncated;
 
-  RGWDataChangesLogInfo shard_info;
-  string datalog_marker;
-
   Mutex inc_lock;
   Cond inc_cond;
 
@@ -1359,17 +1356,9 @@ public:
         }
 
 
-        yield call(new RGWReadRemoteDataLogShardInfoCR(sync_env, shard_id, &shard_info));
-        if (retcode < 0) {
-          ldout(sync_env->cct, 0) << "ERROR: failed to fetch remote data log info: ret=" << retcode << dendl;
-          stop_spawned_services();
-          drain_all();
-          return set_cr_error(retcode);
-        }
-        datalog_marker = shard_info.marker;
 #define INCREMENTAL_MAX_ENTRIES 100
-	ldout(sync_env->cct, 20) << __func__ << ":" << __LINE__ << ": shard_id=" << shard_id << " datalog_marker=" << datalog_marker << " sync_marker.marker=" << sync_marker.marker << dendl;
-	if (datalog_marker > sync_marker.marker) {
+	ldout(sync_env->cct, 20) << __func__ << ":" << __LINE__ << ": shard_id=" << shard_id << " sync_marker=" << sync_marker.marker << dendl;
+	{
           spawned_keys.clear();
           yield call(new RGWReadRemoteDataLogShardCR(sync_env, shard_id, &sync_marker.marker, &log_entries, &truncated));
           if (retcode < 0) {
@@ -1415,7 +1404,7 @@ public:
             }
           }
 	}
-	ldout(sync_env->cct, 20) << __func__ << ":" << __LINE__ << ": shard_id=" << shard_id << " datalog_marker=" << datalog_marker << " sync_marker.marker=" << sync_marker.marker << " truncated=" << truncated << dendl;
+	ldout(sync_env->cct, 20) << __func__ << ":" << __LINE__ << ": shard_id=" << shard_id << " sync_marker=" << sync_marker.marker << " truncated=" << truncated << dendl;
 	if (!truncated) {
 #define INCREMENTAL_INTERVAL 20
 	  yield wait(utime_t(INCREMENTAL_INTERVAL, 0));