Skip to content
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: data/bilogs are trimmed when no peers are reading them #30130

Merged
merged 5 commits into from Oct 11, 2019

Conversation

@smithfarm
Copy link
Contributor

smithfarm commented Sep 4, 2019

cbodley added 5 commits Apr 25, 2019
the metadata listing does not include the start_marker, so we need to
include it at the end if we looped all the way around

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit fcd4312)
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit af7801f)

Conflicts:
	src/rgw/rgw_sync_log_trim.cc
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit f758f7c)

Conflicts:
	src/rgw/rgw_trim_datalog.cc
- file does not exist in mimic; made the changes manually in
  src/rgw/rgw_data_sync.cc
if no peers zones are configured to sync from us, we can safely trim
our entire log. start with the marker '99999999' (which compares larger
than any key based on a timestamp) instead of an empty marker, then take
the minimum of that with any peer markers

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

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit da3803f)

Conflicts:
	src/rgw/rgw_trim_datalog.cc
- file does not exist in mimic; made the changes manually in
  src/rgw/rgw_data_sync.cc
if datalog trim has no peer zones, it will trim once with
marker=99999999. if we set last_trim=99999999, it will never attempt to
trim again

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 7afc486)

Conflicts:
	src/rgw/rgw_trim_datalog.cc
- file does not exist in mimic; made the changes manually in
  src/rgw/rgw_data_sync.cc
@smithfarm smithfarm added this to the mimic milestone Sep 4, 2019
@smithfarm smithfarm added the rgw label Sep 4, 2019
@smithfarm smithfarm requested a review from cbodley Sep 4, 2019
@smithfarm

This comment has been minimized.

Copy link
Contributor Author

smithfarm commented Sep 4, 2019

@cbodley This one needs careful review since I had to make some of the changes manually.

@smithfarm

This comment has been minimized.

Copy link
Contributor Author

smithfarm commented Sep 8, 2019

jenkins test docs

@smithfarm

This comment has been minimized.

Copy link
Contributor Author

smithfarm commented Sep 8, 2019

jenkins test signed

@smithfarm

This comment has been minimized.

Copy link
Contributor Author

smithfarm commented Sep 8, 2019

jenkins test submodules

Copy link
Contributor

cbodley left a comment

looks good, thanks for working through the conflicts!

@yuriw

This comment has been minimized.

Copy link
Contributor

yuriw commented Oct 4, 2019

@yuriw yuriw merged commit ae123bc into ceph:mimic Oct 11, 2019
4 checks passed
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 deleted the smithfarm:wip-40629-mimic branch Oct 13, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.