]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: do not register as a service daemon
authorPatrick Donnelly <pdonnell@redhat.com>
Thu, 7 Nov 2019 07:07:20 +0000 (23:07 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Fri, 8 Nov 2019 18:02:12 +0000 (10:02 -0800)
This commit undoes the service daemon registration for the MDS. It doesn't look
absolutely necessary and it causes the MDS to be listed twice in the `ceph
versions` output:

    $ ceph versions
        ...
        "mds": {
            "ceph version v15.0.0-6915-g0143b904676 (0143b9046763ea1801efa8358a0c033ec862cea9) octopus (dev)": 3
        },
        "mds": {
            "unknown": 3
        },
        "overall": {
            "ceph version v15.0.0-6915-g0143b904676 (0143b9046763ea1801efa8358a0c033ec862cea9) octopus (dev)": 10,
            "unknown": 3
        }

Fixing that requires looking for duplicates or ignoring MDSs in the
service daemons when the mon processes `ceph versions`. I have a feeling
that it wasn't actually designed to be used by the MDS this way however.
Additionally, the reason for "unknown" version is because the metadata
sent to the mgr does not include "ceph_version".

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
src/mds/MDSRank.cc

index a5296784295eb1e2fa863fc8c37f87fecb5ae9a8..3f5ed581c56dce806ce3c6ec082061d590c9ba28 100644 (file)
@@ -544,14 +544,6 @@ MDSRank::MDSRank(
   op_tracker.set_history_size_and_duration(cct->_conf->mds_op_history_size,
                                            cct->_conf->mds_op_history_duration);
 
-  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", cct->_conf->name.get_id(),
-                                       service_metadata);
-  if (r < 0) {
-    derr << ": failed to register with manager for service status update" << dendl;
-  }
-
   schedule_update_timer_task();
 }