From: runsisi <runsisi@zte.com.cn>
Date: Tue, 17 Apr 2018 06:03:49 +0000 (+0800)
Subject: mgr/MgrClient: service registration filtered by service name instead of daemon name
X-Git-Tag: v13.1.0~195^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2e92ae2471b560af6f728dcbe404eea18868b38d;p=ceph.git

mgr/MgrClient: service registration filtered by service name instead of daemon name

Signed-off-by: runsisi <runsisi@zte.com.cn>
---

diff --git a/src/mgr/MgrClient.cc b/src/mgr/MgrClient.cc
index 5fadf1fe722..19313ec5e9a 100644
--- a/src/mgr/MgrClient.cc
+++ b/src/mgr/MgrClient.cc
@@ -446,11 +446,11 @@ int MgrClient::service_daemon_register(
   const std::map<std::string,std::string>& metadata)
 {
   Mutex::Locker l(lock);
-  if (name == "osd" ||
-      name == "mds" ||
-      name == "client" ||
-      name == "mon" ||
-      name == "mgr") {
+  if (service == "osd" ||
+      service == "mds" ||
+      service == "client" ||
+      service == "mon" ||
+      service == "mgr") {
     // normal ceph entity types are not allowed!
     return -EINVAL;
   }