]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #27623 into nautilus
authorSage Weil <sage@redhat.com>
Tue, 30 Apr 2019 22:31:29 +0000 (17:31 -0500)
committerSage Weil <sage@redhat.com>
Tue, 30 Apr 2019 22:31:29 +0000 (17:31 -0500)
commit1a96461a9a8c60bc6172bdc987462903600f4d85
tree278a119640ba12f15ab00ebc8b94c2f8ebcf7f27
parentd555a9489eb35f84f2e1ef49b77e19da9d113972
parente5bcd0c21cf0c8a8a2d1c95792d3786a3e00c2aa
Merge PR #27623 into nautilus

* refs/pull/27623/head:
qa: add crush-node-flags test
mon/OSDMonitor: remove crush node flags too on "crush rm"
mon/OSDMonitor: make per-OSD no{out,down,in,out} flags prior to CRUSH nodes
mon/OSDMonitor: osd add-no{up,down,in,out} - remove state checker
mon/OSDMonitor: respect crush node flags for can_mark_*()
osd/OSDMap: add get_crush_node_flags(int osd)
mon/OSDMonitor: make 'osd {add,rm}-{noin,noout,...}' support crush nodes
osd/OSDMap: raise OSD_FLAGS health alert for crush node flags, too
osd/OSDMap: add flags for crush nodes

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
src/mon/OSDMonitor.cc