From 632e4d839f68fd86bbe920fb39f9cee53778705a Mon Sep 17 00:00:00 2001 From: "Adam C. Emerson" Date: Thu, 2 Apr 2020 19:23:07 -0400 Subject: [PATCH] common: move to_string and to_integer overloads into root namespace Since that's where the type is defined, that's where overloads taking it should be defined. Signed-off-by: Adam C. Emerson --- src/common/ceph_releases.cc | 8 ++++---- src/common/ceph_releases.h | 25 +++++++++++-------------- src/librados/RadosClient.cc | 7 +++---- src/mds/MDSMap.cc | 4 ++-- src/mon/MgrMap.h | 2 +- src/mon/MonMap.cc | 8 ++++---- src/mon/MonmapMonitor.cc | 2 +- src/mon/OSDMonitor.cc | 2 +- src/osd/OSDMap.cc | 10 +++++----- 9 files changed, 32 insertions(+), 36 deletions(-) diff --git a/src/common/ceph_releases.cc b/src/common/ceph_releases.cc index 9086801818b..67264c45aba 100644 --- a/src/common/ceph_releases.cc +++ b/src/common/ceph_releases.cc @@ -18,7 +18,7 @@ ceph_release_t ceph_release_from_name(std::string_view s) { ceph_release_t r = ceph_release_t::max; while (--r != ceph_release_t::unknown) { - if (s == ceph::to_string(r)) { + if (s == to_string(r)) { return r; } } @@ -37,14 +37,14 @@ bool can_upgrade_from(ceph_release_t from_release, const auto to_release = ceph_release(); if (cutoff < to_release) { err << "recorded " << from_release_name << " " - << ceph::to_integer(from_release) << " (" << from_release << ") " + << to_integer(from_release) << " (" << from_release << ") " << "is >2 releases older than installed " - << ceph::to_integer(to_release) << " (" << to_release << "); " + << to_integer(to_release) << " (" << to_release << "); " << "you can only upgrade 2 releases at a time\n" << "you should first upgrade to "; auto release = from_release; while (++release <= cutoff) { - err << ceph::to_integer(release) << " (" << release << ")"; + err << to_integer(release) << " (" << release << ")"; if (release < cutoff) { err << " or "; } else { diff --git a/src/common/ceph_releases.h b/src/common/ceph_releases.h index f5daef6bf07..93ee3c02d8b 100644 --- a/src/common/ceph_releases.h +++ b/src/common/ceph_releases.h @@ -32,22 +32,22 @@ enum class ceph_release_t : std::uint8_t { std::ostream& operator<<(std::ostream& os, const ceph_release_t r); -static inline bool operator!(ceph_release_t& r) { +inline bool operator!(ceph_release_t& r) { return (r < ceph_release_t::unknown || r == ceph_release_t::unknown); } -static inline ceph_release_t& operator--(ceph_release_t& r) { +inline ceph_release_t& operator--(ceph_release_t& r) { r = static_cast(static_cast(r) - 1); return r; } -static inline ceph_release_t& operator++(ceph_release_t& r) { +inline ceph_release_t& operator++(ceph_release_t& r) { r = static_cast(static_cast(r) + 1); return r; } -static inline bool operator<(ceph_release_t lhs, ceph_release_t rhs) { +inline bool operator<(ceph_release_t lhs, ceph_release_t rhs) { // we used to use -1 for invalid release if (static_cast(lhs) < 0) { return true; @@ -57,7 +57,7 @@ static inline bool operator<(ceph_release_t lhs, ceph_release_t rhs) { return static_cast(lhs) < static_cast(rhs); } -static inline bool operator>(ceph_release_t lhs, ceph_release_t rhs) { +inline bool operator>(ceph_release_t lhs, ceph_release_t rhs) { // we used to use -1 for invalid release if (static_cast(lhs) < 0) { return false; @@ -67,7 +67,7 @@ static inline bool operator>(ceph_release_t lhs, ceph_release_t rhs) { return static_cast(lhs) > static_cast(rhs); } -static inline bool operator>=(ceph_release_t lhs, ceph_release_t rhs) { +inline bool operator>=(ceph_release_t lhs, ceph_release_t rhs) { return !(lhs < rhs); } @@ -78,12 +78,9 @@ bool can_upgrade_from(ceph_release_t from_release, ceph_release_t ceph_release_from_name(std::string_view sv); ceph_release_t ceph_release(); -namespace ceph -{ - static inline std::string_view to_string(ceph_release_t r) { - return ceph_release_name(static_cast(r)); - } - template IntType to_integer(ceph_release_t r) { - return static_cast(r); - } +inline std::string_view to_string(ceph_release_t r) { + return ceph_release_name(static_cast(r)); +} +template IntType to_integer(ceph_release_t r) { + return static_cast(r); } diff --git a/src/librados/RadosClient.cc b/src/librados/RadosClient.cc index 4de30e1e7df..3fc4bbec659 100644 --- a/src/librados/RadosClient.cc +++ b/src/librados/RadosClient.cc @@ -444,7 +444,7 @@ int librados::RadosClient::get_min_compatible_osd(int8_t* require_osd_release) objecter->with_osdmap( [require_osd_release](const OSDMap& o) { - *require_osd_release = ceph::to_integer(o.require_osd_release); + *require_osd_release = to_integer(o.require_osd_release); }); return 0; } @@ -459,10 +459,9 @@ int librados::RadosClient::get_min_compatible_client(int8_t* min_compat_client, objecter->with_osdmap( [min_compat_client, require_min_compat_client](const OSDMap& o) { - *min_compat_client = - ceph::to_integer(o.get_min_compat_client()); + *min_compat_client = to_integer(o.get_min_compat_client()); *require_min_compat_client = - ceph::to_integer(o.get_require_min_compat_client()); + to_integer(o.get_require_min_compat_client()); }); return 0; } diff --git a/src/mds/MDSMap.cc b/src/mds/MDSMap.cc index 6c1a0c2fdb0..f1ff7c36f7f 100644 --- a/src/mds/MDSMap.cc +++ b/src/mds/MDSMap.cc @@ -150,7 +150,7 @@ void MDSMap::dump(Formatter *f) const f->dump_int("root", root); f->dump_int("session_timeout", session_timeout); f->dump_int("session_autoclose", session_autoclose); - f->dump_stream("min_compat_client") << ceph::to_integer(min_compat_client) << " (" + f->dump_stream("min_compat_client") << to_integer(min_compat_client) << " (" << min_compat_client << ")"; f->dump_int("max_file_size", max_file_size); f->dump_int("last_failure", last_failure); @@ -230,7 +230,7 @@ void MDSMap::print(ostream& out) const out << "session_timeout\t" << session_timeout << "\n" << "session_autoclose\t" << session_autoclose << "\n"; out << "max_file_size\t" << max_file_size << "\n"; - out << "min_compat_client\t" << ceph::to_integer(min_compat_client) << " (" + out << "min_compat_client\t" << to_integer(min_compat_client) << " (" << min_compat_client << ")\n"; out << "last_failure\t" << last_failure << "\n" << "last_failure_osd_epoch\t" << last_failure_osd_epoch << "\n"; diff --git a/src/mon/MgrMap.h b/src/mon/MgrMap.h index d6a0e69af5a..e0fb172277f 100644 --- a/src/mon/MgrMap.h +++ b/src/mon/MgrMap.h @@ -352,7 +352,7 @@ public: } std::set get_always_on_modules() const { - auto it = always_on_modules.find(ceph::to_integer(ceph_release())); + auto it = always_on_modules.find(to_integer(ceph_release())); if (it == always_on_modules.end()) return {}; return it->second; diff --git a/src/mon/MonMap.cc b/src/mon/MonMap.cc index ec4412a6b63..f02a65dab7a 100644 --- a/src/mon/MonMap.cc +++ b/src/mon/MonMap.cc @@ -328,7 +328,7 @@ void MonMap::print(ostream& out) const out << "fsid " << fsid << "\n"; out << "last_changed " << last_changed << "\n"; out << "created " << created << "\n"; - out << "min_mon_release " << ceph::to_integer(min_mon_release) + out << "min_mon_release " << to_integer(min_mon_release) << " (" << min_mon_release << ")\n"; unsigned i = 0; for (auto p = ranks.begin(); p != ranks.end(); ++p) { @@ -342,8 +342,8 @@ void MonMap::dump(Formatter *f) const f->dump_stream("fsid") << fsid; last_changed.gmtime(f->dump_stream("modified")); created.gmtime(f->dump_stream("created")); - f->dump_unsigned("min_mon_release", ceph::to_integer(min_mon_release)); - f->dump_string("min_mon_release_name", ceph::to_string(min_mon_release)); + f->dump_unsigned("min_mon_release", to_integer(min_mon_release)); + f->dump_string("min_mon_release_name", to_string(min_mon_release)); f->open_object_section("features"); persistent_features.dump(f, "persistent"); optional_features.dump(f, "optional"); @@ -368,7 +368,7 @@ void MonMap::dump(Formatter *f) const void MonMap::dump_summary(Formatter *f) const { f->dump_unsigned("epoch", epoch); - f->dump_string("min_mon_release_name", ceph::to_string(min_mon_release)); + f->dump_string("min_mon_release_name", to_string(min_mon_release)); f->dump_unsigned("num_mons", ranks.size()); } diff --git a/src/mon/MonmapMonitor.cc b/src/mon/MonmapMonitor.cc index 496667a6466..b7cfbdd0c77 100644 --- a/src/mon/MonmapMonitor.cc +++ b/src/mon/MonmapMonitor.cc @@ -208,7 +208,7 @@ void MonmapMonitor::apply_mon_features(const mon_feature_t& features, } if (min_mon_release > pending_map.min_mon_release) { dout(1) << __func__ << " increasing min_mon_release to " - << ceph::to_integer(min_mon_release) << " (" << min_mon_release + << to_integer(min_mon_release) << " (" << min_mon_release << ")" << dendl; pending_map.min_mon_release = min_mon_release; } diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 2a3d309f096..60e1ffa6761 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -11036,7 +11036,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, if (!sure) { FeatureMap m; mon->get_combined_feature_map(&m); - uint64_t features = ceph_release_features(ceph::to_integer(vno)); + uint64_t features = ceph_release_features(to_integer(vno)); bool first = true; bool ok = true; for (int type : { diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc index 23903c29674..4123910f483 100644 --- a/src/osd/OSDMap.cc +++ b/src/osd/OSDMap.cc @@ -1005,8 +1005,8 @@ void OSDMap::Incremental::dump(Formatter *f) const f->dump_float("new_full_ratio", new_full_ratio); f->dump_float("new_nearfull_ratio", new_nearfull_ratio); f->dump_float("new_backfillfull_ratio", new_backfillfull_ratio); - f->dump_int("new_require_min_compat_client", ceph::to_integer(new_require_min_compat_client)); - f->dump_int("new_require_osd_release", ceph::to_integer(new_require_osd_release)); + f->dump_int("new_require_min_compat_client", to_integer(new_require_min_compat_client)); + f->dump_int("new_require_osd_release", to_integer(new_require_osd_release)); if (fullmap.length()) { f->open_object_section("full_map"); @@ -3501,11 +3501,11 @@ void OSDMap::dump(Formatter *f) const f->dump_int("pool_max", get_pool_max()); f->dump_int("max_osd", get_max_osd()); f->dump_string("require_min_compat_client", - ceph::to_string(require_min_compat_client)); + to_string(require_min_compat_client)); f->dump_string("min_compat_client", - ceph::to_string(get_min_compat_client())); + to_string(get_min_compat_client())); f->dump_string("require_osd_release", - ceph::to_string(require_osd_release)); + to_string(require_osd_release)); f->open_array_section("pools"); for (const auto &pool : pools) { -- 2.39.5