From: Casey Bodley <cbodley@redhat.com>
Date: Wed, 15 Aug 2018 20:04:37 +0000 (-0400)
Subject: rgw: incremental data sync uses truncated flag to detect end of listing
X-Git-Tag: v12.2.9~46^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8bb877e1636b84ae2c569c9a6ea153b6cdbdaf36;p=ceph.git

rgw: incremental data sync uses truncated flag to detect end of listing

we call wait() after incremental sync if we've reached the end of the
datalog listing. the existing logic compares our local marker with the
remote's high marker, with some extra code to handle the case where the
remote log was trimmed

all of this can be simplified by using the 'truncated' flag returned
with the RGWReadRemoteDataLogShardCR used to list the remote datalog

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

Conflicts:
	src/rgw/rgw_data_sync.cc: write log with ldout
---

diff --git a/src/rgw/rgw_data_sync.cc b/src/rgw/rgw_data_sync.cc
index 5aac1833bbe7..bbb0973e92b1 100644
--- a/src/rgw/rgw_data_sync.cc
+++ b/src/rgw/rgw_data_sync.cc
@@ -1429,8 +1429,8 @@ public:
             }
           }
 	}
-	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 || remote_trimmed == RemoteTrimmed) {
+	ldout(sync_env->cct, 20) << __func__ << ":" << __LINE__ << ": shard_id=" << shard_id << " datalog_marker=" << datalog_marker << " sync_marker.marker=" << sync_marker.marker << " truncated=" << truncated << dendl;
+	if (!truncated) {
 #define INCREMENTAL_INTERVAL 20
 	  yield wait(utime_t(INCREMENTAL_INTERVAL, 0));
 	}