]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d1f4782) | patch
osd,mon: explicitly specify OSD features in MOSDBoot 4960/head
authorSage Weil <sage@redhat.com>
Wed, 18 Feb 2015 22:53:04 +0000 (14:53 -0800)
committerDavid Zafman <dzafman@redhat.com>
Mon, 15 Jun 2015 15:23:13 +0000 (08:23 -0700)
commit254676b63b559fa0117520edb5dcbfe067a76747
tree930b06265fb9342bc76640ee06a85fee04ae5114tree | snapshot
parentd1f478200342f422ee6e563bf7aad54ba38b3ed3commit | diff
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 bee91548b07c6a28314dddc50fef8b6a2677e774)

Conflicts:
src/osd/OSD.cc
Minor difference in the MOSDBoot constructor
src/messages/MOSDBoot.h diff | blob | history
src/mon/Monitor.cc diff | blob | history
src/mon/OSDMonitor.cc diff | blob | history
src/osd/OSD.cc diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.