From: Sage Weil <sage@newdream.net>
Date: Fri, 5 Mar 2021 14:40:59 +0000 (-0500)
Subject: Revert "rgw: register daemon in service map with more details"
X-Git-Tag: v17.1.0~2723^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=780b71cd0f069757094cab01ac39b43dad687b9e;p=ceph.git

Revert "rgw: register daemon in service map with more details"

This reverts commit 46ec2f0ddd81b4b5b4a61633eada998dcd606c9b.

This broke cephadm (by triggering CEPHADM_STRAY_DAEMON) because cephadm
assumes that a daemon named rgw.r.z.foo will register as rgw.r.z.foo.

It is not clear to me that there is a way to work around this naming
mismatch that makes much sense.  I think it makes more sense to focus on
the use-case that needs daemons to register under unique names and perhaps
control that naming behavior via an option or invest in providing daemons
with unique ids up front.

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index bf3eae6b8d32..c8932c748aa1 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -1136,9 +1136,7 @@ int RGWRados::register_to_service_map(const string& daemon_type, const map<strin
   if (name.compare(0, 4, "rgw.") == 0) {
     name = name.substr(4);
   }
-  std::string instance_id = stringify(rados.get_instance_id());
-  std::string rgw_service_map_name = name + "." + instance_id;
-  int ret = rados.service_daemon_register(daemon_type, rgw_service_map_name, metadata);
+  int ret = rados.service_daemon_register(daemon_type, name, metadata);
   if (ret < 0) {
     ldout(cct, 0) << "ERROR: service_daemon_register() returned ret=" << ret << ": " << cpp_strerror(-ret) << dendl;
     return ret;