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: multisite: intermittent failures in test_bucket_sync_disable_enable #24316

Merged
merged 3 commits into from Oct 4, 2018

Conversation

Projects
None yet
3 participants
@smithfarm
Contributor

smithfarm commented Sep 28, 2018

cbodley added some commits Aug 14, 2018

rgw: return errors from RGWInitBucketShardSyncStatusCoroutine
return ENOENT so caller can detect whether sync is stopped

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 72ac0aa)
rgw: bucket sync crs mutate rgw_bucket_shard_sync_info in place
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 6c6917b)

Conflicts:
	src/rgw/rgw_data_sync.cc
- no "tn_parent", "_tn_parent" in luminous

@smithfarm smithfarm self-assigned this Sep 28, 2018

@smithfarm smithfarm added this to the luminous milestone Sep 28, 2018

@smithfarm smithfarm requested review from cbodley and yehudasa Sep 28, 2018

@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Sep 28, 2018

@cbodley The conflict resolution on this one was more involved than usual - might warrant a closer look?

@smithfarm smithfarm added rgw and removed core labels Sep 28, 2018

@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Sep 28, 2018

/home/jenkins-build/build/workspace/ceph-pull-requests/src/rgw/rgw_data_sync.cc: In member function ‘virtual int RGWRunBucketSyncCoroutine::operate()’:
/home/jenkins-build/build/workspace/ceph-pull-requests/src/rgw/rgw_data_sync.cc:3054:11: error: ‘tn’ was not declared in this scope
           tn->log(0, "bucket sync disabled");
           ^
rgw: bucket sync transitions back to StateInit on OP_SYNCSTOP
the handling for OP_SYNCSTOP->OP_RESYNC is incorrect because it's not
safe to continue incremental sync after SYNCSTOP. any changes between
SYNCSTOP and RESYNC will not be written to the bilog, so incremental
sync cannot sync them

SYNCSTOP now transitions back to StateInit, where
RGWInitBucketShardSyncStatusCoroutine will query the remote bilog info
to see if it's still disabled. if so, it deletes the sync status object
and finishes. otherwise, StateInit will transition back to StateFull to
resync the bucket

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

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

Conflicts:
	src/rgw/rgw_data_sync.cc
- ldout instead of tn

@smithfarm smithfarm force-pushed the smithfarm:wip-26979-luminous branch from 568cf45 to 2e0703b Sep 28, 2018

@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Sep 28, 2018

jenkins test docs

@cbodley

looks great, thanks for working through the tn->log() conflicts

@yuriw

This comment has been minimized.

Contributor

yuriw commented Oct 2, 2018

@yuriw yuriw merged commit 7e129f5 into ceph:luminous Oct 4, 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 deleted the smithfarm:wip-26979-luminous branch Oct 5, 2018

@smithfarm smithfarm changed the title from luminous: multisite: intermittent failures in test_bucket_sync_disable_enable to luminous: rgw: multisite: intermittent failures in test_bucket_sync_disable_enable Oct 26, 2018

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