]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/MgrClient: service registration filtered by service name instead of daemon name 21459/head
authorrunsisi <runsisi@zte.com.cn>
Tue, 17 Apr 2018 06:03:49 +0000 (14:03 +0800)
committerrunsisi <runsisi@zte.com.cn>
Tue, 17 Apr 2018 06:03:49 +0000 (14:03 +0800)
Signed-off-by: runsisi <runsisi@zte.com.cn>
src/mgr/MgrClient.cc

index 5fadf1fe72295b88f6130383f83bf09dafa8d247..19313ec5e9a9144193f653bdc21089eec7737b87 100644 (file)
@@ -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;
   }