os/filestore: fix merge_collection replay guards #24806
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jdurgin
approved these changes
Oct 29, 2018
|
/a/sage-2018-11-05_14:43:15-rados-wip-sage3-testing-2018-11-04-2008-distro-basic-smithi/3226718 -2162> 2018-11-05 15:41:20.933 7fb40c4d5700 10 filestore(/var/lib/ceph/osd/ceph-3) _destroy_collection(5474): /var/lib/ceph/osd/ceph-3/current/1.24_TEMP = 0 -2161> 2018-11-05 15:41:20.933 7fb40c4d5700 10 filestore(/var/lib/ceph/osd/ceph-3) _destroy_collection(5474): /var/lib/ceph/osd/ceph-3/current/1.24_head = 0 -2152> 2018-11-05 15:41:20.933 7fb40c4d5700 -1 filestore(/var/lib/ceph/osd/ceph-3) _close_replay_guard(2608): 1.24_TEMP error (2) No such file or directory -938> 2018-11-05 15:41:20.936 7fb40c4d5700 -1 /home/jenkins-build/build/workspace/ceph-dev-new-build/ARCH/x86_64/AVAILABLE_ARCH/x86_64/AVAILABLE_DIST/centos7/DIST/centos7/MACHINE_SIZE/huge/release/14.0.0-4796-gfdd4a33/rpm/el7/BUILD/ceph-14.0.0-4796-gfdd4a33/src/os/filestore/FileStore.cc: In function 'void FileStore::_close_replay_guard(const coll_t&, const SequencerPosition&)' thread 7fb40c4d5700 time 2018-11-05 15:41:20.933853 |
The guards are based on spos, which does not change across the call to _merge_collection, which means we can't open and close multiple guards within this call. Instead, use a single set of set_guards and closes surrounding both the collection and temp. Also, remove the conditional guard around _remove_collection, which we want to (try to) do (again) as long as we didn't complete our global replay guard. Fixes: http://tracker.ceph.com/issues/36610 Signed-off-by: Sage Weil <sage@redhat.com>
liewegas
added a commit
that referenced
this pull request
Nov 9, 2018
* refs/pull/24806/head: os/filestore: fix merge_collection replay guards Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The guards are based on spos, which does not change across the call to
_merge_collection, which means we can't open and close multiple guards
within this call. Instead, use a single set of set_guards and closes
surrounding both the collection and temp.
Also, remove the conditional guard around _remove_collection, which we
want to (try to) do (again) as long as we didn't complete our global
replay guard.
Fixes: http://tracker.ceph.com/issues/36610
Signed-off-by: Sage Weil sage@redhat.com