Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mds: use same inode count in health check as in trim #14197

Merged
merged 1 commit into from
Apr 20, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/mds/Beacon.cc
Original file line number Diff line number Diff line change
Expand Up @@ -483,10 +483,10 @@ void Beacon::notify_health(MDSRank const *mds)
}

// Report if we have significantly exceeded our cache size limit
if (CInode::count() >
if (mds->mdcache->get_cache_size() >
g_conf->mds_cache_size * g_conf->mds_health_cache_threshold) {
std::ostringstream oss;
oss << "Too many inodes in cache (" << CInode::count()
oss << "Too many inodes in cache (" << mds->mdcache->get_cache_size()
<< "/" << g_conf->mds_cache_size << "), "
<< mds->mdcache->num_inodes_with_caps << " inodes in use by clients, "
<< mds->mdcache->get_num_strays() << " stray files";
Expand Down