From: Sage Weil <sage@redhat.com>
Date: Fri, 24 Feb 2017 20:47:41 +0000 (-0500)
Subject: mon/PGMap: constify a few things
X-Git-Tag: v12.0.2~252^2~67
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=564bff0014a59c02446063d13bc50c6d2ae0071b;p=ceph.git

mon/PGMap: constify a few things

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/mon/PGMap.cc b/src/mon/PGMap.cc
index 539ed74c74f4..c23f34142882 100644
--- a/src/mon/PGMap.cc
+++ b/src/mon/PGMap.cc
@@ -1742,7 +1742,7 @@ void PGMap::generate_test_instances(list<PGMap*>& o)
 }
 
 void PGMap::get_filtered_pg_stats(uint32_t state, int64_t poolid, int64_t osdid,
-                                  bool primary, set<pg_t>& pgs)
+                                  bool primary, set<pg_t>& pgs) const
 {
   for (ceph::unordered_map<pg_t, pg_stat_t>::const_iterator i = pg_stat.begin();
        i != pg_stat.end();
@@ -1757,11 +1757,11 @@ void PGMap::get_filtered_pg_stats(uint32_t state, int64_t poolid, int64_t osdid,
   }
 }
 
-void PGMap::dump_filtered_pg_stats(Formatter *f, set<pg_t>& pgs)
+void PGMap::dump_filtered_pg_stats(Formatter *f, set<pg_t>& pgs) const
 {
   f->open_array_section("pg_stats");
   for (set<pg_t>::iterator i = pgs.begin(); i != pgs.end(); ++i) {
-    pg_stat_t& st = pg_stat[*i];
+    const pg_stat_t& st = pg_stat.at(*i);
     f->open_object_section("pg_stat");
     f->dump_stream("pgid") << *i;
     st.dump(f);
@@ -1770,7 +1770,7 @@ void PGMap::dump_filtered_pg_stats(Formatter *f, set<pg_t>& pgs)
   f->close_section();
 }
 
-void PGMap::dump_filtered_pg_stats(ostream& ss, set<pg_t>& pgs)
+void PGMap::dump_filtered_pg_stats(ostream& ss, set<pg_t>& pgs) const
 {
   TextTable tab;
 
@@ -1797,7 +1797,7 @@ void PGMap::dump_filtered_pg_stats(ostream& ss, set<pg_t>& pgs)
   tab.define_column("DEEP_SCRUB_STAMP", TextTable::LEFT, TextTable::RIGHT);
 
   for (set<pg_t>::iterator i = pgs.begin(); i != pgs.end(); ++i) {
-    pg_stat_t& st = pg_stat[*i];
+    const pg_stat_t& st = pg_stat.at(*i);
 
     ostringstream reported;
     reported << st.reported_epoch << ":" << st.reported_seq;
diff --git a/src/mon/PGMap.h b/src/mon/PGMap.h
index ad356506f311..a86db113ecb6 100644
--- a/src/mon/PGMap.h
+++ b/src/mon/PGMap.h
@@ -289,7 +289,7 @@ public:
   void dump_pool_stats(Formatter *f) const;
   void dump_osd_stats(Formatter *f) const;
   void dump_delta(Formatter *f) const;
-  void dump_filtered_pg_stats(Formatter *f, set<pg_t>& pgs);
+  void dump_filtered_pg_stats(Formatter *f, set<pg_t>& pgs) const;
 
   void dump_pg_stats_plain(ostream& ss,
 			   const ceph::unordered_map<pg_t, pg_stat_t>& pg_stats,
@@ -307,7 +307,7 @@ public:
   void dump_pool_stats(ostream& ss, bool header) const;
   void dump_osd_stats(ostream& ss) const;
   void dump_osd_sum_stats(ostream& ss) const;
-  void dump_filtered_pg_stats(ostream& ss, set<pg_t>& pgs);
+  void dump_filtered_pg_stats(ostream& ss, set<pg_t>& pgs) const;
 
   void dump_osd_perf_stats(Formatter *f) const;
   void print_osd_perf_stats(std::ostream *ss) const;
@@ -316,7 +316,7 @@ public:
   void print_osd_blocked_by_stats(std::ostream *ss) const;
 
   void get_filtered_pg_stats(uint32_t state, int64_t poolid, int64_t osdid,
-                             bool primary, set<pg_t>& pgs);
+                             bool primary, set<pg_t>& pgs) const;
   void recovery_summary(Formatter *f, list<string> *psl,
                         const pool_stat_t& delta_sum) const;
   void overall_recovery_summary(Formatter *f, list<string> *psl) const;