RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-03 09:32:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 46ec2f0ddd.

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>
This commit is contained in:
Sage Weil 2021-03-05 09:40:59 -05:00
parent cab87f956b
commit 780b71cd0f
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/rgw/rgw_rados.cc
View File

@ -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;