From a1a220d137f7fa128d08f96d1eff83865388e5fc Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@redhat.com>
Date: Tue, 29 Oct 2019 14:17:47 -0500
Subject: [PATCH] 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>
---
 src/mds/MDSRank.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/mds/MDSRank.cc b/src/mds/MDSRank.cc
index bd046ad75d889..72f85f9737e90 100644
--- a/src/mds/MDSRank.cc
+++ b/src/mds/MDSRank.cc
@@ -546,7 +546,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;
   }
-- 
2.39.5