mon: fix force_pg_create pg stuck in creating bug #12539
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
songbaisen
reviewed
Dec 20, 2016
src/mon/PGMonitor.cc
Outdated
| // the cluster. As soon as everybody has upgraded we can flipt to the new | ||
| // behavior instead | ||
| OSDMap& osdmap = mon->osdmon()->osdmap; | ||
| if (osdmap.get_num_up_osds() == 0) |
|
Shouldn't matter; if there are no OSDs the no OSDs will be subscribing to create messages.
|
liewegas
force-pushed
the
wip-mon-pg-creates
branch
from
23c2aca
to
c7f93e3
Compare
liewegas
force-pushed
the
wip-mon-pg-creates
branch
from
c7f93e3
to
61892ea
Compare
|
@tchaikov rebased this on master |
jecluis
approved these changes
Jan 31, 2017
tchaikov
approved these changes
Jan 31, 2017
|
retest this please |
|
retest this please |
liewegas
force-pushed
the
wip-mon-pg-creates
branch
from
61892ea
to
33ff3e9
Compare
liewegas
force-pushed
the
wip-mon-pg-creates
branch
from
33ff3e9
to
89292f3
Compare
tchaikov
reviewed
Feb 6, 2017
src/mon/PGMonitor.cc
Outdated
| if (osdmap.get_num_up_osds() > 0) { | ||
| assert(osdmap.get_up_osd_features() & CEPH_FEATURE_MON_STATEFUL_SUB); | ||
| } | ||
| check_subs(); |
There was a problem hiding this comment.
could move check_subs() into the if (osdmap.get_num_up_osds() > 0) block, because only OSD is interested in the pg creates updates.
ff1fd4b already removed most of this; remove the now useless stub and clean up the unneede con check. Signed-off-by: Sage Weil <sage@redhat.com>
Forgot this in 6cbdd67 Signed-off-by: Sage Weil <sage@redhat.com>
We weren't carefully registering the creating PG. In particular, the current osd mappings (acting, up, etc.) weren't getting filled in, which meant the PG wasn't (necessarily) mapped to an OSD until the OSDMap updated and we recalculated mappings. Fix by sending us through the common code path so that all fields get updated properly. Fixes: http://tracker.ceph.com/issues/18298 Signed-off-by: Sage Weil <sage@redhat.com>
liewegas
force-pushed
the
wip-mon-pg-creates
branch
from
89292f3
to
9a41a0b
Compare
|
updated
|
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/18298
Also clean out some more legacy crud we don't need.