mon: post-luminous cleanup (part 3 of ?) #17607
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
liewegas
force-pushed
the
wip-post-luminous-more-mon
branch
from
3bb0e8d
to
3c2ae4b
Compare
|
will rebase |
Signed-off-by: Sage Weil <sage@redhat.com>
Signed-off-by: Sage Weil <sage@redhat.com>
Signed-off-by: Sage Weil <sage@redhat.com>
Signed-off-by: Sage Weil <sage@redhat.com>
Signed-off-by: Sage Weil <sage@redhat.com>
Signed-off-by: Sage Weil <sage@redhat.com>
liewegas
force-pushed
the
wip-post-luminous-more-mon
branch
from
3c2ae4b
to
b81715b
Compare
gregsfortytwo
requested changes
Sep 15, 2017
| @@ -1776,7 +1776,8 @@ void Monitor::handle_probe_reply(MonOpRequestRef op) | |||
| << " upgrading" << dendl; | |||
| exit(0); | |||
| } | |||
| if (!osdmon()->osdmap.test_flag(CEPH_OSDMAP_PURGED_SNAPDIRS)) { | |||
| if (!osdmon()->osdmap.test_flag(CEPH_OSDMAP_PURGED_SNAPDIRS) || | |||
| !osdmon()->osdmap.test_flag(CEPH_OSDMAP_RECOVERY_DELETES)) { | |||
There was a problem hiding this comment.
Is RECOVERY_DELETES actually set as part of a scrub? I don't know how that works.
There was a problem hiding this comment.
Once the (luminous) mon sees that all legacy_snapdirs have been removed it sets the flag. The mimic mons refuse to start up if that flag isn't set yet (i.e., if they didn't stay on luminous long enough to do the conversion).
src/mon/OSDMonitor.cc
Outdated
| @@ -7481,16 +7474,6 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, | |||
| goto reply; | |||
| } | |||
| if (prefix == "osd crush weight-set create") { | |||
| if (osdmap.require_min_compat_client > 0 && | |||
| osdmap.require_min_compat_client < CEPH_RELEASE_LUMINOUS) { | |||
There was a problem hiding this comment.
Surely we don't mean to require Luminous clients to talk to Mimic clusters?
src/mon/OSDMonitor.cc
Outdated
| err = -EPERM; | ||
| goto reply; | ||
| } | ||
| if (osdmap.require_min_compat_client < CEPH_RELEASE_LUMINOUS) { |
Signed-off-by: Sage Weil <sage@redhat.com>
Signed-off-by: Sage Weil <sage@redhat.com>
…ions Signed-off-by: Sage Weil <sage@redhat.com>
Signed-off-by: Sage Weil <sage@redhat.com>
Signed-off-by: Sage Weil <sage@redhat.com>
Signed-off-by: Sage Weil <sage@redhat.com>
Signed-off-by: Sage Weil <sage@redhat.com>
We may not end up doing this but it keeps a template for how the guard worked before in the code for future reference. Signed-off-by: Sage Weil <sage@redhat.com>
liewegas
force-pushed
the
wip-post-luminous-more-mon
branch
from
b81715b
to
8ade1af
Compare
|
@gregsfortytwo ok to merge? |
|
jenkins test docs |
gregsfortytwo
approved these changes
Sep 19, 2017
|
Yep, looks good @liewegas! |
|
thanks! |
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.