mon/MDSMonitor: wait for readable OSDMap before sanitizing #18603
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
batrick
changed the title
liewegas
requested changes
Oct 27, 2017
src/mon/MDSMonitor.cc
Outdated
| @@ -137,6 +135,11 @@ void MDSMonitor::init() | |||
|
|
|||
| void MDSMonitor::create_pending() | |||
| { | |||
| if (mon->osdmon()->is_readable()) { | |||
| auto &osdmap = mon->osdmon()->osdmap; | |||
| fsmap.sanitize([&osdmap](int64_t pool){return osdmap.have_pg_pool(pool);}); | |||
Fixes: http://tracker.ceph.com/issues/21945 Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
liewegas
approved these changes
Oct 27, 2017
|
retest this please |
tchaikov
approved these changes
Oct 30, 2017
This was referenced Oct 30, 2017
tchaikov
reviewed
Oct 30, 2017
| @@ -140,6 +138,11 @@ void MDSMonitor::create_pending() | |||
| pending_fsmap = fsmap; | |||
| pending_fsmap.epoch++; | |||
|
|
|||
| if (mon->osdmon()->is_readable()) { | |||
There was a problem hiding this comment.
if you have concern about the ordering in which osdmap is updated and mdsmap is updated, asPAXOS_MDSMAP < PAXOS_OSDMAP. probably you can do this in post_paxos_update() where all paxos services have been refreshed.
There was a problem hiding this comment.
that ensures a valid osdmap, but we still shouldn't touch the fsmap. the change should be applied to pending_fsmap, which means it goes in create_pending or encode_pending
liewegas
changed the title
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.
Fixes: http://tracker.ceph.com/issues/21945
Signed-off-by: Patrick Donnelly pdonnell@redhat.com