Merge pull request #16715 from adamemerson/wip-I-Object!

osdc/Objecter: Boost.Asio (I object!)

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>

diff --cc src/CMakeLists.txt
Simple merge

diff --cc src/client/Client.cc
Simple merge

diff --cc src/common/options.cc
Simple merge

diff --cc src/global/global_init.cc
Simple merge

diff --cc src/librbd/Journal.cc
Simple merge

diff --cc src/mds/CDir.cc
Simple merge

diff --cc src/mds/MDCache.cc
Simple merge

diff --cc src/mds/MDSDaemon.cc
Simple merge

diff --cc src/mds/MDSDaemon.h
Simple merge

diff --cc src/mds/MDSRank.cc
Simple merge

diff --cc src/mgr/MgrStandby.cc
Simple merge

diff --cc src/mgr/MgrStandby.h
Simple merge

diff --cc src/mon/ConfigMap.cc
index b7343ce4264b5b84e12c8457ea4413c408b18fa2,a7a151b22a918a3b8ff54432d18ec806fb1ea808..696b18edbc48c286e399ff3816739fc89a4b302b
--- 1/src/mon/ConfigMap.cc
--- 2/src/mon/ConfigMap.cc
+++ b/src/mon/ConfigMap.cc
@@@ -115,20 -113,11 +115,20 @@@ ConfigMap::generate_entity_map
    vector<pair<string,Section*>> sections = { make_pair("global", &global) };
    auto p = by_type.find(name.get_type_name());
    if (p != by_type.end()) {
-     sections.push_back(make_pair(name.get_type_name(), &p->second));
+     sections.emplace_back(name.get_type_name(), &p->second);
    }
 -  auto q = by_id.find(name.to_str());
 -  if (q != by_id.end()) {
 -    sections.push_back(make_pair(name.to_str(), &q->second));
 +  vector<std::string> name_bits;
 +  boost::split(name_bits, name.to_str(), [](char c){ return c == '.'; });
 +  std::string tname;
 +  for (unsigned p = 0; p < name_bits.size(); ++p) {
 +    if (p) {
 +      tname += '.';
 +    }
 +    tname += name_bits[p];
 +    auto q = by_id.find(tname);
 +    if (q != by_id.end()) {
 +      sections.push_back(make_pair(tname, &q->second));
 +    }
    }
    std::map<std::string,std::string,std::less<>> out;
    MaskedOption *prev = nullptr;

diff --cc src/mon/MonMap.cc
Simple merge

diff --cc src/msg/async/ProtocolV2.cc
Simple merge

diff --cc src/osd/OSD.cc
Simple merge

diff --cc src/osd/OSD.h
Simple merge

diff --cc src/osd/PrimaryLogPG.cc
Simple merge

diff --cc src/osd/PrimaryLogPG.h
Simple merge

diff --cc src/rgw/rgw_bucket.cc
Simple merge

diff --cc src/tools/CMakeLists.txt
Simple merge