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: multisite: rgw_data_sync_status json decode failure breaks automated datalog trimming #26615

Merged
merged 4 commits into from May 3, 2019

Conversation

Projects
None yet
4 participants
@pdvian
Copy link

commented Feb 25, 2019

cbodley added some commits Feb 18, 2019

rgw: fix rgw_data_sync_info::json_decode()
this was trying to decode a 'uint64_t instance_id' into the wrong
variable 'uint32_t num_shards'

datalog trimming relies on this json format, and decode failures here
prevent any trimming from taking place

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

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 2b51d52)
rgw: add 'datalog autotrim' admin command
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 832eaef)

Conflicts:
	src/rgw/rgw_admin.cc : Resolved for g_conf
test/rgw_multi: add test_datalog_autotrim()
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 2bd1595)
rgw: wakeup lease_cr after abort on bucket sync disable
the 'bucket sync disable' tests were causing data sync to lag behind
because these calls to lease_cr->abort() were still waiting for the
RGWContinuousLeaseCR to wake up from its sleep. added data sync
checkpoints to each 'bucket sync disable' test to make sure that data
sync catches up before running other tests, as this was causing failures
in the new 'datalog autotrim' test

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

@smithfarm smithfarm added this to the mimic milestone Mar 1, 2019

@smithfarm smithfarm added the rgw label Mar 1, 2019

@smithfarm smithfarm requested a review from cbodley Apr 10, 2019

@yuriw

This comment has been minimized.

Copy link
Contributor

commented May 2, 2019

@yuriw yuriw merged commit 0d5c736 into ceph:mimic May 3, 2019

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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.