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

Merge PR #32308 into master

Browse Source 
* refs/pull/32308/head:
	mon/MDSMonitor: cleanup check_subs

Reviewed-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Patrick Donnelly 2020-01-06 12:26:58 -08:00
commit f714c4bd3e
No known key found for this signature in database
GPG Key ID: 3A2A7E25BEA8AADB
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/mon/MDSMonitor.cc
View File

@ -1503,29 +1503,33 @@ int MDSMonitor::filesystem_command(
void MDSMonitor::check_subs()
{
std::list<std::string> types;
// Subscriptions may be to "mdsmap" (MDS and legacy clients),
// "mdsmap.<namespace>", or to "fsmap" for the full state of all
// filesystems. Build a list of all the types we service
// subscriptions for.
types.push_back("fsmap");
types.push_back("fsmap.user");
types.push_back("mdsmap");
std::vector<std::string> types = {
"fsmap",
"fsmap.user",
"mdsmap",
};
for (const auto &p : get_fsmap().filesystems) {
const auto &fscid = p.first;
std::ostringstream oss;
oss << "mdsmap." << fscid;
types.push_back(oss.str());
CachedStackStringStream cos;
*cos << "mdsmap." << fscid;
types.push_back(std::string(cos->strv()));
}
for (const auto &type : types) {
if (mon->session_map.subs.count(type) == 0)
auto& subs = mon->session_map.subs;
auto subs_it = subs.find(type);
if (subs_it == subs.end())
continue;
xlist<Subscription*>::iterator p = mon->session_map.subs[type]->begin();
while (!p.end()) {
Subscription *sub = *p;
++p;
auto sub_it = subs_it->second->begin();
while (!sub_it.end()) {
auto sub = *sub_it;
++sub_it; // N.B. check_sub may remove sub!
check_sub(sub);
}
}