From 4e9c362e3094399d618ff8b641ddc3e52f84a6f6 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 23 Feb 2017 14:16:51 -0500 Subject: [PATCH] osd: rename failsafe [near]full getters appropriately ...and make most of these methods private to clarify the public interface Signed-off-by: Sage Weil --- src/osd/OSD.cc | 12 +++++++----- src/osd/OSD.h | 6 ++++-- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 1a3b4b5b176..d1df4799b88 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -64,6 +64,7 @@ #include "messages/MOSDPing.h" #include "messages/MOSDFailure.h" #include "messages/MOSDMarkMeDown.h" +#include "messages/MOSDFull.h" #include "messages/MOSDOp.h" #include "messages/MOSDOpReply.h" #include "messages/MOSDBackoff.h" @@ -699,14 +700,14 @@ void OSDService::promote_throttle_recalibrate() // ------------------------------------- -float OSDService::get_full_ratio() +float OSDService::get_failsafe_full_ratio() { float full_ratio = cct->_conf->osd_failsafe_full_ratio; if (full_ratio > 1.0) full_ratio /= 100.0; return full_ratio; } -float OSDService::get_nearfull_ratio() +float OSDService::get_failsafe_nearfull_ratio() { float nearfull_ratio = cct->_conf->osd_failsafe_nearfull_ratio; if (nearfull_ratio > 1.0) nearfull_ratio /= 100.0; @@ -725,9 +726,10 @@ void OSDService::check_nearfull_warning(const osd_stat_t &osd_stat) // chunks reserved for metadata, and for our purposes (avoiding // completely filling the disk) it's far more important to know how // much space is available to use than how much we've already used. - float ratio = ((float)(osd_stat.kb - osd_stat.kb_avail)) / ((float)osd_stat.kb); - float nearfull_ratio = get_nearfull_ratio(); - float full_ratio = get_full_ratio(); + float ratio = ((float)(osd_stat.kb - osd_stat.kb_avail)) / + ((float)osd_stat.kb); + float nearfull_ratio = get_failsafe_nearfull_ratio(); + float full_ratio = get_failsafe_full_ratio(); cur_ratio = ratio; if (full_ratio > 0 && ratio > full_ratio) { diff --git a/src/osd/OSD.h b/src/osd/OSD.h index 9114a5d2e9d..6e16d633cbd 100644 --- a/src/osd/OSD.h +++ b/src/osd/OSD.h @@ -1134,13 +1134,15 @@ public: } // -- OSD Full Status -- +private: Mutex full_status_lock; enum s_names { NONE, NEAR, FULL } cur_state; time_t last_msg; double cur_ratio; - float get_full_ratio(); - float get_nearfull_ratio(); + float get_failsafe_full_ratio(); + float get_failsafe_nearfull_ratio(); void check_nearfull_warning(const osd_stat_t &stat); +public: bool check_failsafe_full(); bool too_full_for_backfill(double *ratio, double *max_ratio); -- 2.39.5