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

mimic: rgw: multisite: incremental data sync makes unnecessary call to RGWReadRemoteDataLogShardInfoCR #24710

Merged
merged 3 commits into from Oct 29, 2018

Conversation

Projects
None yet
3 participants
@smithfarm
Copy link
Contributor

smithfarm commented Oct 23, 2018

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)
rgw: remove unused datalog trim detection logic
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 0d47743)
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)

Conflicts:
	src/rgw/rgw_data_sync.cc
- trivial whitespace
@smithfarm

This comment has been minimized.

Copy link
Contributor

smithfarm commented Oct 23, 2018

jenkins test docs

@smithfarm

This comment has been minimized.

Copy link
Contributor

smithfarm commented Oct 23, 2018

/home/jenkins-build/build/workspace/ceph-pull-requests/src/rgw/rgw_data_sync.cc: In member function 'int RGWDataSyncShardCR::incremental_sync()':
/home/jenkins-build/build/workspace/ceph-pull-requests/src/rgw/rgw_data_sync.cc:1511:30: error: 'INCREMENTAL_INTERVAL' was not declared in this scope
           yield wait(utime_t(INCREMENTAL_INTERVAL, 0));
                              ^~~~~~~~~~~~~~~~~~~~
src/rgw/CMakeFiles/rgw_a.dir/build.make:858: recipe for target 'src/rgw/CMakeFiles/rgw_a.dir/rgw_data_sync.cc.o' failed
make[3]: *** [src/rgw/CMakeFiles/rgw_a.dir/rgw_data_sync.cc.o] Error 1

@smithfarm smithfarm force-pushed the smithfarm:wip-35977-mimic branch from 65abffa to 84e6273 Oct 23, 2018

@smithfarm

This comment has been minimized.

Copy link
Contributor

smithfarm commented Oct 23, 2018

@cbodley Removed the last ("indentation fix-up") commit because it conflicts with 515a38e

(In other words, there is a backport ordering issue at play - commits are being backported to mimic in a different order than they were applied to master.)

@yuriw

This comment has been minimized.

Copy link
Contributor

yuriw commented Oct 24, 2018

@yuriw

yuriw approved these changes Oct 29, 2018

Copy link
Contributor

yuriw left a comment

Reviewed-by: Casey Bodley cbodley@redhat.com

@yuriw yuriw merged commit 088e36f into ceph:mimic Oct 29, 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

@smithfarm smithfarm changed the title mimic: multisite: incremental data sync makes unnecessary call to RGWReadRemoteDataLogShardInfoCR mimic: rgw: multisite: incremental data sync makes unnecessary call to RGWReadRemoteDataLogShardInfoCR Oct 29, 2018

@smithfarm smithfarm deleted the smithfarm:wip-35977-mimic branch Oct 29, 2018

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