mon/OSDMonitor: should propose osdmap update when cluster addr changed #11065
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
|
@tchaikov would you mind to take a look? thanks! |
tchaikov
reviewed
Sep 19, 2016
| @@ -2108,7 +2109,9 @@ bool OSDMonitor::prepare_boot(MonOpRequestRef op) | |||
| if (osdmap.is_up(from)) { | |||
| dout(7) << "prepare_boot was up, first marking down " << osdmap.get_inst(from) << dendl; | |||
| // preprocess should have caught these; if not, assert. | |||
| assert(osdmap.get_inst(from) != m->get_orig_source_inst()); | |||
| bool addr_changed = (osdmap.get_inst(from) != m->get_orig_source_inst() || | |||
There was a problem hiding this comment.
could also put osdmap.get_cluster_addr(from) != m->cluster_addr) on a new line. like
assert(osdmap.get_inst(from) != m->get_orig_source_inst() ||
osdmap.get_cluster_addr(from) != m->cluster_addr);as ideally, assert() is a no-op in a NDEBUG build, and compiler or static analyzer would complain at seeing a variable not being used anywhere.
|
lgtm modulo the nit. |
|
@LiumxNL ping |
ghost
added
…anged Signed-off-by: Mingxin Liu <mingxin@xsky.com>
LiumxNL
force-pushed
the
wip-fix-osdmap-update
branch
from
5d25f7a
to
fe33935
Compare
tchaikov
approved these changes
Dec 22, 2016
liewegas
changed the title
liewegas
approved these changes
Dec 24, 2016
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.
osd maybe rebind cluster addr but keep public addr unchanged in _committed_osd_maps() method, to be on the safe side, monitor should take cluster addr into account when determining whether should propose osdmap update.
Signed-off-by: Mingxin Liu mingxin@xsky.com