librbd: blacklist clients before breaking locks #3704
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
added 4 commits
February 6, 2015 06:42
Convenience method to invoke the mon "osd blacklist add" command and validating the result. Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Prior to breaking a client's lock, blacklist the clients from the OSDs to prevent possible race conditions with data updates. Added a new RBD configuration option to control the behavior. Fixes: #10761 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
The break lock unit test was updated to use a different librados client to prevent blacklisting itself when breaking the lock of a "dead" client. Signed-off-by: Jason Dillaman <dillaman@redhat.com>
The new librados API method is used by RBD so it needs to be added to the test stub. Signed-off-by: Jason Dillaman <dillaman@redhat.com>
|
FAIL: the output of run-make-check.sh on centos-centos7 for 8735057 is http://paste2.org/_6pW3MFGX |
Sent from
|
SUCCESS: the output of run-make-check.sh on centos-centos7 for b370584 is http://paste2.org/_7eBNFJEN |
| self.require_state("connected") | ||
| ret = run_in_thread(self.librados.rados_blacklist_add, | ||
| (self.cluster, c_char_p(client_address), | ||
| expire_seconds)) |
| ldout(m_image_ctx.cct, 1) << "blacklisting client: " << locker << "@" | ||
| << locker_address << dendl; | ||
| librados::Rados rados(m_image_ctx.md_ctx); | ||
| r = rados.blacklist_add(locker_address, 0); |
There was a problem hiding this comment.
we should probably make the expiration configurable too, since the default on the monitor isn't, and if it was the global default might not make sense for rbd
|
FAIL: the output of run-make-check.sh on centos-centos7 for 5cb544f is http://paste2.org/_6hpCA0Ox |
|
SUCCESS: the output of run-make-check.sh on centos-centos7 for 6e81c51 is http://paste2.org/_YMEMEJmA |
jdurgin
added a commit
that referenced
this pull request
Feb 12, 2015
librbd: blacklist clients before breaking locks 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.
No description provided.