diff options
| author | Sage Weil <sage@inktank.com> | 2013-08-13 15:40:53 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-08-13 15:40:53 -0700 |
| commit | f417b10196ae6b7b4674861507e25366be34f948 (patch) | |
| tree | 26e19087dc66e9b249a7009fdeb1c3abade0fe45 | |
| parent | 6f5d8036f3e70c5e30edf7e36fb8ff9a56197f60 (diff) | |
| download | ceph-f417b10196ae6b7b4674861507e25366be34f948.tar.gz | |
osdmap: move oneliner summary to separate function
We're about to make print_summary() do something much nicer.
Signed-off-by: Sage Weil <sage@inktank.com>
| -rw-r--r-- | src/osd/OSDMap.cc | 12 | ||||
| -rw-r--r-- | src/osd/OSDMap.h | 3 |
2 files changed, 14 insertions, 1 deletions
diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc index 36a43ff4b57..2c035f46b04 100644 --- a/src/osd/OSDMap.cc +++ b/src/osd/OSDMap.cc @@ -1754,6 +1754,18 @@ void OSDMap::print_summary(Formatter *f, ostream& out) const } } +void OSDMap::print_oneline_summary(ostream& out) const +{ + out << "e" << get_epoch() << ": " + << get_num_osds() << " osds: " + << get_num_up_osds() << " up, " + << get_num_in_osds() << " in"; + if (test_flag(CEPH_OSDMAP_FULL)) + out << " full"; + else if (test_flag(CEPH_OSDMAP_NEARFULL)) + out << " nearfull"; +} + bool OSDMap::crush_ruleset_in_use(int ruleset) const { for (map<int64_t,pg_pool_t>::const_iterator p = pools.begin(); p != pools.end(); ++p) { diff --git a/src/osd/OSDMap.h b/src/osd/OSDMap.h index 0badd0abea3..2b0cbb8020c 100644 --- a/src/osd/OSDMap.h +++ b/src/osd/OSDMap.h @@ -606,6 +606,7 @@ private: public: void print(ostream& out) const; void print_summary(Formatter *f, ostream& out) const; + void print_oneline_summary(ostream& out) const; void print_tree(ostream *out, Formatter *f) const; string get_flag_string() const; @@ -621,7 +622,7 @@ WRITE_CLASS_ENCODER_FEATURES(OSDMap::Incremental) typedef std::tr1::shared_ptr<const OSDMap> OSDMapRef; inline ostream& operator<<(ostream& out, const OSDMap& m) { - m.print_summary(NULL, out); + m.print_oneline_summary(out); return out; } |