kraken: librbd: is_exclusive_lock_owner API should ping OSD #14480
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
Signed-off-by: Jason Dillaman <dillaman@redhat.com> (cherry picked from commit 6861745)
trociny
reviewed
Apr 13, 2017
src/librbd/ExclusiveLock.cc
Outdated
| @@ -254,6 +254,40 @@ void ExclusiveLock<I>::handle_peer_notification(int r) { | |||
| } | |||
|
|
|||
| template <typename I> | |||
| int ExclusiveLock<I>::assert_header_locked() { | |||
| CephContext *cct = m_image_ctx.cct; | |||
| ldout(cct, 10) << dendl; | |||
There was a problem hiding this comment.
@dillaman It needs << this << " " << __func__ << prefix to follow this file convention (the same is for other ldout/lderr in this function).
This is required to detect if a peer has been silently blacklisted and is therefore no longer the lock owner. Fixes: http://tracker.ceph.com/issues/19287 Signed-off-by: Jason Dillaman <dillaman@redhat.com> (cherry picked from commit e15db05) Conflicts: src/librbd/ManagedLock.[h|cc]: logic moved to ExclusiveLock
dillaman
force-pushed
the
wip-19467-kraken
branch
from
6737dd9
to
7e30b63
Compare
|
@dillaman This PR was included in this rbd run: http://pulpito.ceph.com/smithfarm-2017-04-13_17:53:19-rbd-wip-kraken-backports-distro-basic-smithi/ When I wrote this there was 1 job still running, but otherwise all passed. OK to merge? |
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.
http://tracker.ceph.com/issues/19467