Navigation Menu

Skip to content

Commit

Permalink
osd mon mgr: REBASE: Fix the use of get_val<>()
Browse files Browse the repository at this point in the history 
Signed-off-by: David Zafman <dzafman@redhat.com>
  • Loading branch information
@dzafman
dzafman committed Oct 18, 2019
1 parent e49f071 commit 8007515
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 16 deletions.
10 changes: 5 additions & 5 deletions src/mgr/ClusterState.cc
View file
Expand Up @@ -214,10 +214,10 @@ bool ClusterState::asok_command(std::string_view admin_command, const cmdmap_t&
// Default to health warning level if nothing specified
if (!(cmd_getval(g_ceph_context, cmdmap, "value", value))) {
// Convert milliseconds to microseconds
value = static_cast<int64_t>(g_ceph_context->_conf.get_val<double>("mon_warn_on_slow_ping_time")) * 1000;
value = static_cast<int64_t>(g_ceph_context->_conf->get_val<double>("mon_warn_on_slow_ping_time")) * 1000;
if (value == 0) {
double ratio = g_conf().get_val<double>("mon_warn_on_slow_ping_ratio");
value = g_conf().get_val<int64_t>("osd_heartbeat_grace");
double ratio = g_conf()->get_val<double>("mon_warn_on_slow_ping_ratio");
value = g_conf()->get_val<int64_t>("osd_heartbeat_grace");
value *= 1000000 * ratio; // Seconds of grace to microseconds at ratio
}
} else {
Expand Down Expand Up @@ -262,7 +262,7 @@ bool ClusterState::asok_command(std::string_view admin_command, const cmdmap_t&

if (j.second.last_update == 0)
continue;
auto stale_time = g_ceph_context->_conf.get_val<int64_t>("osd_mon_heartbeat_stat_stale");
auto stale_time = g_ceph_context->_conf->get_val<int64_t>("osd_mon_heartbeat_stat_stale");
if (now.sec() - j.second.last_update > stale_time) {
dout(20) << __func__ << " time out heartbeat for osd " << i.first
<< " last_update " << j.second.last_update << dendl;
Expand Down Expand Up @@ -326,7 +326,7 @@ bool ClusterState::asok_command(std::string_view admin_command, const cmdmap_t&
char buffer[26];
string lustr(ctime_r(&lu, buffer));
lustr.pop_back(); // Remove trailing \n
auto stale = g_ceph_context->_conf.get_val<int64_t>("osd_heartbeat_stale");
auto stale = g_ceph_context->_conf->get_val<int64_t>("osd_heartbeat_stale");
f->dump_string("last update", lustr);
f->dump_bool("stale", ceph_clock_now().sec() - sitem.last_update > stale);
f->dump_int("from osd", sitem.from);
Expand Down
6 changes: 3 additions & 3 deletions src/mon/PGMap.cc
View file
Expand Up @@ -2582,10 +2582,10 @@ void PGMap::get_health_checks(

// SLOW_PING_TIME
// Convert milliseconds to microseconds
auto warn_slow_ping_time = cct->_conf.get_val<double>("mon_warn_on_slow_ping_time") * 1000;
auto grace = cct->_conf.get_val<int64_t>("osd_heartbeat_grace");
auto warn_slow_ping_time = cct->_conf->get_val<double>("mon_warn_on_slow_ping_time") * 1000;
auto grace = cct->_conf->get_val<int64_t>("osd_heartbeat_grace");
if (warn_slow_ping_time == 0) {
double ratio = cct->_conf.get_val<double>("mon_warn_on_slow_ping_ratio");
double ratio = cct->_conf->get_val<double>("mon_warn_on_slow_ping_ratio");
warn_slow_ping_time = grace;
warn_slow_ping_time *= 1000000 * ratio; // Seconds of grace to microseconds at ratio
}
Expand Down
16 changes: 8 additions & 8 deletions src/osd/OSD.cc
View file
Expand Up @@ -810,7 +810,7 @@ osd_stat_t OSDService::set_osd_stat(vector<int>& hb_peers,
int num_pgs)
{
utime_t now = ceph_clock_now();
auto stale_time = g_conf().get_val<int64_t>("osd_mon_heartbeat_stat_stale");
auto stale_time = g_conf()->get_val<int64_t>("osd_mon_heartbeat_stat_stale");
Mutex::Locker l(stat_lock);
osd_stat.hb_peers.swap(hb_peers);
osd->op_tracker.get_age_ms_histogram(&osd_stat.op_queue_age_hist);
Expand Down Expand Up @@ -2301,10 +2301,10 @@ will start to track new ops received afterwards.";
int64_t value = 0;
if (!(cmd_getval(cct, cmdmap, "value", value))) {
// Convert milliseconds to microseconds
value = static_cast<int64_t>(g_conf().get_val<double>("mon_warn_on_slow_ping_time")) * 1000;
value = static_cast<int64_t>(g_conf()->get_val<double>("mon_warn_on_slow_ping_time")) * 1000;
if (value == 0) {
double ratio = g_conf().get_val<double>("mon_warn_on_slow_ping_ratio");
value = g_conf().get_val<int64_t>("osd_heartbeat_grace");
double ratio = g_conf()->get_val<double>("mon_warn_on_slow_ping_ratio");
value = g_conf()->get_val<int64_t>("osd_heartbeat_grace");
value *= 1000000 * ratio; // Seconds of grace to microseconds at ratio
}
} else {
Expand Down Expand Up @@ -2397,7 +2397,7 @@ will start to track new ops received afterwards.";
char buffer[26];
string lustr(ctime_r(&lu, buffer));
lustr.pop_back(); // Remove trailing \n
auto stale = cct->_conf.get_val<int64_t>("osd_heartbeat_stale");
auto stale = cct->_conf->get_val<int64_t>("osd_heartbeat_stale");
f->dump_string("last update", lustr);
f->dump_bool("stale", ceph_clock_now().sec() - sitem.last_update > stale);
f->dump_int("from osd", whoami);
Expand Down Expand Up @@ -4818,8 +4818,8 @@ void OSD::handle_osd_ping(MOSDPing *m)
if (i->second.hb_interval_start == utime_t())
i->second.hb_interval_start = now;
int64_t hb_avg_time_period = 60;
if (cct->_conf.get_val<int64_t>("debug_heartbeat_testing_span")) {
hb_avg_time_period = cct->_conf.get_val<int64_t>("debug_heartbeat_testing_span");
if (cct->_conf->get_val<int64_t>("debug_heartbeat_testing_span")) {
hb_avg_time_period = cct->_conf->get_val<int64_t>("debug_heartbeat_testing_span");
}
if (now - i->second.hb_interval_start >= utime_t(hb_avg_time_period, 0)) {
uint32_t back_avg = i->second.hb_total_back / i->second.hb_average_count;
Expand Down Expand Up @@ -4986,7 +4986,7 @@ void OSD::heartbeat_entry()
heartbeat();

double wait;
if (cct->_conf.get_val<bool>("debug_disable_randomized_ping")) {
if (cct->_conf->get_val<bool>("debug_disable_randomized_ping")) {
wait = (float)cct->_conf->osd_heartbeat_interval;
} else {
wait = .5 + ((float)(rand() % 10)/10.0) * (float)cct->_conf->osd_heartbeat_interval;
Expand Down

0 comments on commit 8007515

Please sign in to comment.