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

mds: calculate load by checking self CPU usage

Browse Source 
when mds_bal_mode is 2, system CPU load is treated as mds load.
This is not good when the machine runs multiple tasks.

Fixes: http://tracker.ceph.com/issues/26834
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
This commit is contained in:
Yan, Zheng 2018-07-31 11:32:02 +08:00
parent 55e60ab17d
commit 1ff36edd2a
2 changed files with 44 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/mds/MDBalancer.cc
View File

@ -245,32 +245,54 @@ mds_load_t MDBalancer::get_load()
}
uint64_t num_requests = mds->get_num_requests();
bool new_req_rate = false;
if (last_get_load != clock::zero() &&
now > last_get_load &&
num_requests >= last_num_requests) {
double el = std::chrono::duration<double>(now-last_get_load).count();
if (el >= 1.0) {
load.req_rate = (num_requests - last_num_requests) / (double)el;
new_req_rate = true;
uint64_t cpu_time = 1;
{
string stat_path = PROCPREFIX "/proc/self/stat";
ifstream stat_file(stat_path);
if (stat_file.is_open()) {
vector<string> stat_vec(std::istream_iterator<string>{stat_file},
std::istream_iterator<string>());
if (stat_vec.size() >= 15) {
// utime + stime
cpu_time = strtoll(stat_vec[13].c_str(), nullptr, 10) +
strtoll(stat_vec[14].c_str(), nullptr, 10);
} else {
derr << "input file '" << stat_path << "' not resolvable" << dendl_impl;
}
} else {
derr << "input file '" << stat_path << "' not found" << dendl_impl;
}
}
if (!new_req_rate) {
auto p = mds_load.find(mds->get_nodeid());
if (p != mds_load.end())
load.req_rate = p->second.req_rate;
}
last_get_load = now;
last_num_requests = num_requests;
load.queue_len = messenger->get_dispatch_queue_len();
ifstream cpu(PROCPREFIX "/proc/loadavg");
if (cpu.is_open())
cpu >> load.cpu_load_avg;
else
derr << "input file " PROCPREFIX "'/proc/loadavg' not found" << dendl_impl;
bool update_last = true;
if (last_get_load != clock::zero() &&
now > last_get_load) {
double el = std::chrono::duration<double>(now-last_get_load).count();
if (el >= 1.0) {
if (num_requests > last_num_requests)
load.req_rate = (num_requests - last_num_requests) / el;
if (cpu_time > last_cpu_time)
load.cpu_load_avg = (cpu_time - last_cpu_time) / el;
} else {
auto p = mds_load.find(mds->get_nodeid());
if (p != mds_load.end()) {
load.req_rate = p->second.req_rate;
load.cpu_load_avg = p->second.cpu_load_avg;
}
if (num_requests >= last_num_requests && cpu_time >= last_cpu_time)
update_last = false;
}
}
if (update_last) {
last_num_requests = num_requests;
last_cpu_time = cpu_time;
last_get_load = now;
}
dout(15) << "get_load " << load << dendl;
return load;
}

1
src/mds/MDBalancer.h
View File

@ -139,6 +139,7 @@ private:
time last_get_load = clock::zero();
uint64_t last_num_requests = 0;
uint64_t last_cpu_time = 0;
// Dirfrags which are marked to be passed on to MDCache::[split|merge]_dir
// just as soon as a delayed context comes back and triggers it.