From: Kefu Chai <kchai@redhat.com>
Date: Fri, 28 Aug 2020 05:39:54 +0000 (+0800)
Subject: mgr/DaemonState: avoid searching for a daemon state twice
X-Git-Tag: v16.1.0~1176^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f9a11737ea5c37abcc2a11dbf67016d7d3057d58;p=ceph.git

mgr/DaemonState: avoid searching for a daemon state twice

and less repeating this way

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/mgr/ActivePyModules.cc b/src/mgr/ActivePyModules.cc
index 9f928cea7668..a7fc09407673 100644
--- a/src/mgr/ActivePyModules.cc
+++ b/src/mgr/ActivePyModules.cc
@@ -153,7 +153,7 @@ PyObject *ActivePyModules::get_daemon_status_python(
 
   std::lock_guard l(metadata->lock);
   PyFormatter f;
-  for (const auto &[daemon, status] : metadataz->service_status) {
+  for (const auto &[daemon, status] : metadata->service_status) {
     f.dump_string(daemon, status);
   }
   return f.get();
diff --git a/src/mgr/DaemonState.cc b/src/mgr/DaemonState.cc
index 87f820bffb7d..07d585417990 100644
--- a/src/mgr/DaemonState.cc
+++ b/src/mgr/DaemonState.cc
@@ -216,8 +216,8 @@ DaemonStateCollection DaemonStateIndex::get_by_server(
 {
   std::shared_lock l{lock};
 
-  if (by_server.count(hostname)) {
-    return by_server.at(hostname);
+  if (auto found = by_server.find(hostname); found != by_server.end()) {
+    return found->second;
   } else {
     return {};
   }