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

Merge pull request #10316 from batrick/mds-standby-assertions

Browse Source 
mds: add assertions for standby_daemons invariant

Reviewed-by: John Spray <john.spray@redhat.com>
This commit is contained in:
John Spray 2016-07-20 15:43:43 +01:00 committed by GitHub
commit 297500399e
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mds/FSMap.cc
View File

@ -430,9 +430,7 @@ void FSMap::decode(bufferlist::iterator& p)
p.second.rank = p.second.standby_for_rank;
}
if (p.second.rank == MDS_RANK_NONE) {
standby_daemons[p.first] = p.second;
standby_epochs[p.first] = epoch;
mds_roles[p.first] = FS_CLUSTER_ID_NONE;
insert(p.second); // into standby_daemons
} else {
mds_roles[p.first] = migrate_fs->fscid;
}
@ -789,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)];