From: Kefu Chai <kchai@redhat.com>
Date: Sat, 6 Aug 2016 16:58:04 +0000 (+0800)
Subject: mon/PGMonitor: mark dump_object_stat_sum() as static
X-Git-Tag: v10.2.4~50^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=109da6fd2fa8a6f8e56a1fe2daa6a738bb2a1fde;p=ceph.git

mon/PGMonitor: mark dump_object_stat_sum() as static

so we can test this method without create an instance of PGMonitor.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit af3d3e25823ca9b40ddf09835edb82795ac68f33)
---

diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc
index 8b4c44bedc02..36b1b72a2ba7 100644
--- a/src/mon/PGMonitor.cc
+++ b/src/mon/PGMonitor.cc
@@ -1369,7 +1369,7 @@ inline string percentify(const float& a) {
 //void PGMonitor::dump_object_stat_sum(stringstream& ss, Formatter *f,
 void PGMonitor::dump_object_stat_sum(TextTable &tbl, Formatter *f,
                                      object_stat_sum_t &sum, uint64_t avail,
-                                     float raw_used_rate, bool verbose, const pg_pool_t *pool) const
+                                     float raw_used_rate, bool verbose, const pg_pool_t *pool)
 {
   float curr_object_copies_rate = 0.0;
   if (sum.num_object_copies > 0)
diff --git a/src/mon/PGMonitor.h b/src/mon/PGMonitor.h
index e4081f1aba0d..11c72a0df22e 100644
--- a/src/mon/PGMonitor.h
+++ b/src/mon/PGMonitor.h
@@ -154,11 +154,11 @@ private:
 			  int threshold,
 			  vector<string>& args) const;
 
-  void dump_object_stat_sum(TextTable &tbl, Formatter *f,
-			    object_stat_sum_t &sum,
-			    uint64_t avail,
-			    float raw_used_rate,
-			    bool verbose, const pg_pool_t *pool) const;
+  static void dump_object_stat_sum(TextTable &tbl, Formatter *f,
+				   object_stat_sum_t &sum,
+				   uint64_t avail,
+				   float raw_used_rate,
+				   bool verbose, const pg_pool_t *pool);
 
   int64_t get_rule_avail(OSDMap& osdmap, int ruleno) const;