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.

Sign up for GitHub

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

Jump to bottom

hammer: mon: improve reweight_by_utilization() logic #9416

Merged
merged 2 commits into from Jul 29, 2016
Merged

hammer: mon: improve reweight_by_utilization() logic #9416

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b6f6f2
mon/OSDMonitor: improve reweight_by_utilization() logic
xiexingguo Apr 26, 2016
23498a9
mon/OSDMonitor: avoid potential expensive grace calculation
xiexingguo May 31, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
33 changes: 20 additions & 13 deletions src/mon/OSDMonitor.cc
View file
Open in desktop
Expand Up @@ -463,10 +463,16 @@ void OSDMonitor::update_logger()
}

struct Sorter {
bool operator()(std::pair<int,float> l,
std::pair<int,float> r) {
return l.second > r.second;
}

double average_util;

Sorter(const double average_util_)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should have been in the previous commit?

: average_util(average_util_)
{}

bool operator()(std::pair<int,float> l, std::pair<int,float> r) {
return abs(l.second - average_util) > abs(r.second - average_util);
}
};

/* Assign a lower weight to overloaded OSDs.
Expand Down Expand Up @@ -595,8 +601,9 @@ int OSDMonitor::reweight_by_utilization(int oload,
util_by_osd.push_back(osd_util);
}

// sort and iterate from most to least utilized
std::sort(util_by_osd.begin(), util_by_osd.end(), Sorter());
// sort by absolute deviation from the mean utilization,
// in descending order.
std::sort(util_by_osd.begin(), util_by_osd.end(), Sorter(average_util));

OSDMap::Incremental newinc;

Expand Down Expand Up @@ -1487,6 +1494,13 @@ void OSDMonitor::check_failures(utime_t now)

bool OSDMonitor::check_failure(utime_t now, int target_osd, failure_info_t& fi)
{
// already pending failure?
if (pending_inc.new_state.count(target_osd) &&
pending_inc.new_state[target_osd] & CEPH_OSD_UP) {
dout(10) << " already pending failure" << dendl;
return true;
}

utime_t orig_grace(g_conf->osd_heartbeat_grace, 0);
utime_t max_failed_since = fi.get_failed_since();
utime_t failed_for = now - max_failed_since;
Expand Down Expand Up @@ -1530,13 +1544,6 @@ bool OSDMonitor::check_failure(utime_t now, int target_osd, failure_info_t& fi)
<< grace << " grace (" << orig_grace << " + " << my_grace << " + " << peer_grace << "), max_failed_since " << max_failed_since
<< dendl;

// already pending failure?
if (pending_inc.new_state.count(target_osd) &&
pending_inc.new_state[target_osd] & CEPH_OSD_UP) {
dout(10) << " already pending failure" << dendl;
return true;
}

if (failed_for >= grace &&
((int)fi.reporters.size() >= g_conf->mon_osd_min_down_reporters) &&
(fi.num_reports >= g_conf->mon_osd_min_down_reports)) {
Expand Down