New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

osd: do not try to boot until we've seen the first osdmap #15732

Merged
merged 1 commit into from Jun 17, 2017

Conversation

Projects
None yet
2 participants
@liewegas
Member

liewegas commented Jun 16, 2017

This is actually not a change in behavior except we see this message
instead of

2017-06-15 18:05:29.760938 24a7f700 -1 osd.1 0 osdmap SORTBITWISE OSDMap flag is NOT set; please set it

because the OSDMap() epoch 0 does not have SORTBITWISE.

Signed-off-by: Sage Weil sage@redhat.com

@@ -5607,7 +5607,9 @@ void OSD::_preboot(epoch_t oldest, epoch_t newest)
heartbeat();
// if our map within recent history, try to add ourselves to the osdmap.
if (osdmap->test_flag(CEPH_OSDMAP_NOUP)) {
if (osdmap->get_epoch() ==0) {

This comment has been minimized.

@tchaikov

tchaikov Jun 16, 2017

Contributor

add a space after ==.

osd: do not try to boot until we've seen the first osdmap
This is actually not a change in behavior *except* we see this message
instead of

2017-06-15 18:05:29.760938 24a7f700 -1 osd.1 0 osdmap SORTBITWISE OSDMap flag is NOT set; please set it

because the OSDMap() epoch 0 does not have SORTBITWISE.

Signed-off-by: Sage Weil <sage@redhat.com>
@liewegas

This comment has been minimized.

Member

liewegas commented Jun 16, 2017

retest this please

@liewegas liewegas merged commit 0598bf5 into ceph:master Jun 17, 2017

4 checks passed

Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
arm64 make check arm64 make check succeeded
Details
make check make check succeeded
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment