RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-17 17:05:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

mds: add assertions for standby_daemons invariant

Browse Source 
These assertions catch state changes of an mds in standby_daemons to a state
other than MDSMap::STATE_STANDBY. Currently this invariant is (sometimes!)
checked in other locations on access of standby_daemons. This commit allows us
catch the violated invariant at the time it occurred.

Related to: http://tracker.ceph.com/issues/16592

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
This commit is contained in:
Patrick Donnelly 2016-07-15 23:29:22 -04:00
parent 9566ae27b3
commit 0f044e0880
No known key found for this signature in database
GPG Key ID: 214CC3B002E532F6
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mds/FSMap.cc
View File

@ -787,6 +787,8 @@ bool FSMap::undamaged(const fs_cluster_id_t fscid, const mds_rank_t rank)
void FSMap::insert(const MDSMap::mds_info_t &new_info)
{
assert(new_info.state == MDSMap::STATE_STANDBY);
assert(new_info.rank == MDS_RANK_NONE);
mds_roles[new_info.global_id] = FS_CLUSTER_ID_NONE;
standby_daemons[new_info.global_id] = new_info;
standby_epochs[new_info.global_id] = epoch;

4
src/mds/FSMap.h
View File

@ -311,7 +311,9 @@ public:
std::function<void(MDSMap::mds_info_t *info)> fn)
{
if (mds_roles.at(who) == FS_CLUSTER_ID_NONE) {
fn(&standby_daemons.at(who));
auto &info = standby_daemons.at(who);
fn(&info);
assert(info.state == MDSMap::STATE_STANDBY);
standby_epochs[who] = epoch;
} else {
auto fs = filesystems[mds_roles.at(who)];