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: explicitly specify OSD features in MOSDBoot #4960

Merged
merged 1 commit into from Jun 19, 2015

Conversation

Projects
None yet
4 participants
@dzafman
Member

dzafman commented Jun 15, 2015

osd,mon: explicitly specify OSD features in MOSDBoot
We are using the connection features to populate the features field in the
OSDMap, but this is the *intersection* of mon and osd features, not the
osd features.  Fix this by explicitly specifying the features in
MOSDBoot.

Fixes: #10911
Backport: giant, firefly
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit bee9154)

Conflicts:
	src/osd/OSD.cc
Minor difference in the MOSDBoot constructor

@dzafman dzafman assigned ghost Jun 15, 2015

@dzafman

This comment has been minimized.

Member

dzafman commented Jun 15, 2015

Should this be branch from firefly-backports or is that just a QE staging area?

@liewegas liewegas added this to the firefly milestone Jun 15, 2015

@ghost ghost added bug fix core labels Jun 15, 2015

@dzafman dzafman added needs-qa and removed bug fix core labels Jun 15, 2015

@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Jun 16, 2015

@dzafman Opening this pull request against firefly was correct. The firefly-backports branch is a staging area for running integration tests. Once those pass, the commits are merged into firefly for QE.

dzafman added a commit that referenced this pull request Jun 19, 2015

Merge pull request #4960 from ceph/wip-10911-firefly
osd,mon: explicitly specify OSD features in MOSDBoot

Reviewed-by: David Zafman <dzafman@redhat.com>

@dzafman dzafman merged commit 1623e6c into firefly Jun 19, 2015

@dzafman dzafman deleted the wip-10911-firefly branch Jun 19, 2015

@ghost ghost added bug fix core labels Jul 8, 2015

@ghost ghost changed the title from osd,mon: explicitly specify OSD features in MOSDBoot to osd: explicitly specify OSD features in MOSDBoot Oct 24, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment