New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 4 commits into from Oct 2, 2018

Conversation

Projects
None yet
5 participants
@jonsger

jonsger commented Sep 24, 2018

https://tracker.ceph.com/issues/35978


Hi,

this is a backport of #23596 for luminous. I had to adapt the logging to ldout. A lot of the diff is just indentation, like in the original PR.

make rgw succeeds and there is no new compiler warning...

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

So far
Jonathan

@theanalyst theanalyst changed the title from rgw: incremental data sync uses truncated flag to detect end of listing to luminous: rgw: incremental data sync uses truncated flag to detect end of listing Sep 24, 2018

@theanalyst theanalyst added this to the luminous milestone Sep 24, 2018

@theanalyst theanalyst added the rgw label Sep 24, 2018

@theanalyst theanalyst requested a review from cbodley Sep 25, 2018

@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Sep 25, 2018

@jonsger Looks good; thanks!

@cbodley

good job resolving the tn->log() conflicts, but the final commit doesn't look right

Show resolved Hide resolved src/rgw/rgw_data_sync.cc Outdated

@jonsger jonsger force-pushed the jonsger:luminous-backport-pr#23596 branch from a51d4c4 to b792512 Sep 25, 2018

@cbodley

thanks!

@yuriw

This comment has been minimized.

Contributor

yuriw commented Sep 26, 2018

@jonsger pls rebase

cbodley added some commits Aug 15, 2018

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 fb2b618)
Signed-off-by: Jonathan Brielmaier <jbrielmaier@suse.de>

Conflicts:
	src/rgw/rgw_data_sync.cc: write log with ldout
rgw: remove unused datalog trim detection logic
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 0d47743)
Signed-off-by: Jonathan Brielmaier <jbrielmaier@suse.de>

Conflicts:
	src/rgw/rgw_data_sync.cc: trivial
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 a543df7)
Signed-off-by: Jonathan Brielmaier <jbrielmaier@suse.de>

Conflicts:
	src/rgw/rgw_data_sync.cc: adapt to ldout, as there is no tn->log
rgw: fix up indentation in incremental data sync
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 666bfe3)
Signed-off-by: Jonathan Brielmaier <jbrielmaier@suse.de>

Conflicts:
	src/rgw/rgw_data_sync.cc: ident regarding current state

@jonsger jonsger force-pushed the jonsger:luminous-backport-pr#23596 branch from b792512 to cf9103c Sep 27, 2018

@jonsger

This comment has been minimized.

jonsger commented Sep 27, 2018

@yuriw sure. The indentation keeps us busy :P

@yuriw

This comment has been minimized.

Contributor

yuriw commented Oct 1, 2018

@yuriw yuriw merged commit 2ac489a into ceph:luminous Oct 2, 2018

4 checks passed

Docs: build check OK - docs built
Details
Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
make check make check succeeded
Details

@jonsger jonsger deleted the jonsger:luminous-backport-pr#23596 branch Oct 10, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment