RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-02 09:02:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

mon: require cephx v2 signatures from other mons for >= mimic

Browse Source 
Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2018-05-04 10:30:03 -05:00
parent 1fdc85f224
commit 3dc80e5f9b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mon/Monitor.cc
View File

@ -2198,7 +2198,8 @@ void Monitor::calc_quorum_requirements()
required_features |= CEPH_FEATUREMASK_SERVER_LUMINOUS;
}
if (features.incompat.contains(CEPH_MON_FEATURE_INCOMPAT_MIMIC)) {
required_features |= CEPH_FEATUREMASK_SERVER_MIMIC;
required_features |= CEPH_FEATUREMASK_SERVER_MIMIC |
CEPH_FEATUREMASK_CEPHX_V2;
}
// monmap
@ -2212,7 +2213,8 @@ void Monitor::calc_quorum_requirements()
}
if (monmap->get_required_features().contains_all(
ceph::features::mon::FEATURE_MIMIC)) {
required_features |= CEPH_FEATUREMASK_SERVER_MIMIC;
required_features |= CEPH_FEATUREMASK_SERVER_MIMIC |
CEPH_FEATUREMASK_CEPHX_V2;
}
dout(10) << __func__ << " required_features " << required_features << dendl;
}