From: Kefu Chai <kchai@redhat.com>
Date: Fri, 28 Aug 2020 08:18:49 +0000 (+0800)
Subject: msg,messages: remove MMonMetadata
X-Git-Tag: v16.1.0~1246^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bf0bf804898e0a1f21c260b47fe8534ad74f5102;p=ceph.git

msg,messages: remove MMonMetadata

MMonMetadata is sent to pre-luminous monitors and handled only for
backward compatibility with pre-luminous monitors. and luminous is
the last release we were still sending this message. but there is no
need for pacific to be compatible with pre-luminous monitors because of
the +2 policy.

so let's drop this message from the source tree.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/messages/MMonMetadata.h b/src/messages/MMonMetadata.h
deleted file mode 100644
index 302dcf1be6e..00000000000
--- a/src/messages/MMonMetadata.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
-/*
- * Ceph - scalable distributed file system
- *
- * Copyright (C) 2015 Red Hat
- *
- * This is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1, as published by the Free Software
- * Foundation.  See file COPYING.
- *
- */
-
-#ifndef CEPH_MMONMETADATA_H
-#define CEPH_MMONMETADATA_H
-
-#include "mon/mon_types.h"
-#include "msg/Message.h"
-
-class MMonMetadata : public Message {
-public:
-  Metadata data;
-
-private:
-  static constexpr int HEAD_VERSION = 1;
-  ~MMonMetadata() override {}
-
-public:
-  MMonMetadata() :
-    Message{CEPH_MSG_MON_METADATA}
-  {}
-  MMonMetadata(const Metadata& metadata) :
-    Message{CEPH_MSG_MON_METADATA, HEAD_VERSION},
-    data(metadata)
-  {}
-
-  std::string_view get_type_name() const override {
-    return "mon_metadata";
-  }
-
-  void encode_payload(uint64_t features) override {
-    using ceph::encode;
-    encode(data, payload);
-  }
-
-  void decode_payload() override {
-    using ceph::decode;
-    auto p = payload.cbegin();
-    decode(data, p);
-  }
-private:
-  template<class T, typename... Args>
-  friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
-};
-
-#endif
diff --git a/src/msg/Message.cc b/src/msg/Message.cc
index 3dd7c02ee7a..23a630e3623 100644
--- a/src/msg/Message.cc
+++ b/src/msg/Message.cc
@@ -110,7 +110,6 @@
 #include "messages/MMonGetVersionReply.h"
 #include "messages/MMonHealth.h"
 #include "messages/MMonHealthChecks.h"
-#include "messages/MMonMetadata.h"
 #include "messages/MAuth.h"
 #include "messages/MAuthReply.h"
 #include "messages/MMonSubscribe.h"
@@ -473,9 +472,6 @@ Message *decode_message(CephContext *cct,
   case CEPH_MSG_MON_GET_VERSION_REPLY:
     m = make_message<MMonGetVersionReply>();
     break;
-  case CEPH_MSG_MON_METADATA:
-    m = make_message<MMonMetadata>();
-    break;
 
   case MSG_OSD_BOOT:
     m = make_message<MOSDBoot>();
diff --git a/src/tools/ceph-dencoder/common_types.h b/src/tools/ceph-dencoder/common_types.h
index fdad619a626..1445580c2e4 100644
--- a/src/tools/ceph-dencoder/common_types.h
+++ b/src/tools/ceph-dencoder/common_types.h
@@ -324,9 +324,6 @@ MESSAGE(MMonJoin)
 #include "messages/MMonMap.h"
 MESSAGE(MMonMap)
 
-#include "messages/MMonMetadata.h"
-MESSAGE(MMonMetadata)
-
 #include "messages/MMonPaxos.h"
 MESSAGE(MMonPaxos)