]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
mon: expand cap validity check for mgr, osd, mds
authorlijing <lijing@gohighsec.com>
Fri, 5 Jan 2018 09:44:57 +0000 (17:44 +0800)
committerKefu Chai <kchai@redhat.com>
Fri, 25 May 2018 14:35:32 +0000 (22:35 +0800)
commit7e97e4d292df616b1182dd6e51518776fe8bc69b
treeaa2421efa7532b5f530028aa63aaf5219727a092
parent1e28d1910d60b23a7485400266fa25828007423a
mon: expand cap validity check for mgr, osd, mds

Also strenghen the check to declare an unknown cap type as invalid.

Note that this means that in a mixed-version cluster, an older mon
would apply the syntax check for the older caps, even if the (say) OSDs
are newer and could parse something different.  This is judged to be fine:
it is not unreasonable to ask for the mons *and* daemons to be upgraded
before using the new cap syntax or feature.

Signed-off-by: Jing Li <lijing@gohighsec.com>
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 113fa941e3a4feaed0891d1fb7d321ade3e1bca7)

Conflicts:
src/mon/AuthMonitor.cc (no mgr in jewel)
src/mon/CMakeLists.txt (no cmake in jewel; backported the changes
                               manually to src/mon/Makefile.am)
src/mon/AuthMonitor.cc
src/mon/AuthMonitor.h
src/mon/Makefile.am