From: Adam C. Emerson Date: Mon, 8 Sep 2025 18:19:20 +0000 (-0400) Subject: rgw: Record the `service_unique_id`, if present, in the SrviceMap X-Git-Tag: testing/wip-jcollin-testing-20250924.023828-squid~7^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=88f8fd2481301ad86a31c108f893433c992ae930;p=ceph-ci.git rgw: Record the `service_unique_id`, if present, in the SrviceMap For consistency and ease associating the two. Signed-off-by: Adam C. Emerson (cherry picked from commit 3a94a7b2ed02d20b2bc839b283e60cf4778f69e4) Signed-off-by: Adam C. Emerson --- diff --git a/src/rgw/driver/rados/rgw_rados.cc b/src/rgw/driver/rados/rgw_rados.cc index c8bf7257f31..32806feed63 100644 --- a/src/rgw/driver/rados/rgw_rados.cc +++ b/src/rgw/driver/rados/rgw_rados.cc @@ -1154,6 +1154,10 @@ int RGWRados::register_to_service_map(const DoutPrefixProvider *dpp, const strin metadata["realm_name"] = svc.zone->get_realm().get_name(); metadata["realm_id"] = svc.zone->get_realm().get_id(); metadata["id"] = name; + auto service_unique_id = cct->_conf.get_val("service_unique_id"); + if (!service_unique_id.empty()) { + metadata["service_unique_id"] = std::move(service_unique_id); + } int ret = rados.service_daemon_register( daemon_type, stringify(rados.get_instance_id()),