mds/MDSRank: report state to mgr as mds id, not rank

Introduced by 625dffe65c0f8001b3b6ca6d0b12732a1a103849, which added
periodic scrub stats reporting.

Fixes: https://tracker.ceph.com/issues/42494
Fixes: https://tracker.ceph.com/issues/41525
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit a1a220d137f7fa128d08f96d1eff83865388e5fc)

diff --git a/src/mds/MDSRank.cc b/src/mds/MDSRank.cc
index 0fd09ee70c7c46d05f69f975a61778663754d862..669d72e3bfc377c1a194601239293a7f7b9b5205 100644 (file)
--- a/src/mds/MDSRank.cc
+++ b/src/mds/MDSRank.cc
@@ -554,7 +554,8 @@ MDSRank::MDSRank(
 
   std::string rank_str = stringify(get_nodeid());
   std::map<std::string, std::string> service_metadata = {{"rank", rank_str}};
-  int r = mgrc->service_daemon_register("mds", rank_str, service_metadata);
+  int r = mgrc->service_daemon_register("mds", cct->_conf->name.get_id(),
+                                       service_metadata);
   if (r < 0) {
     derr << ": failed to register with manager for service status update" << dendl;
   }