From efbe4667d9da5e04e6274367006da39f8e5dbac2 Mon Sep 17 00:00:00 2001 From: Greg Farnum Date: Fri, 10 Mar 2017 18:21:17 -0800 Subject: [PATCH] mgr: create a skeleton MMonMgrReport message type We'll use this for sending data to the monitor at tick intervals. Signed-off-by: Greg Farnum --- src/messages/MMonMgrReport.h | 52 ++++++++++++++++++++++++++++++++++++ src/msg/Message.cc | 5 ++++ src/msg/Message.h | 2 ++ 3 files changed, 59 insertions(+) create mode 100644 src/messages/MMonMgrReport.h diff --git a/src/messages/MMonMgrReport.h b/src/messages/MMonMgrReport.h new file mode 100644 index 00000000000..0e5abec2a8b --- /dev/null +++ b/src/messages/MMonMgrReport.h @@ -0,0 +1,52 @@ +// -*- 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) 2017 Greg Farnum/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_MMONMGRREPORT_H +#define CEPH_MMONMGRREPORT_H + +#include "messages/PaxosServiceMessage.h" +#include "include/types.h" + + +class MMonMgrReport : public PaxosServiceMessage { + + static const int HEAD_VERSION = 1; + static const int COMPAT_VERSION = 1; + +public: + MMonMgrReport() + : PaxosServiceMessage(MSG_MON_MGR_REPORT, 0, HEAD_VERSION, COMPAT_VERSION) + {} + +private: + ~MMonMgrReport() override {} + +public: + + const char *get_type_name() const override { return "monmgrreport"; } + + void print(ostream& out) const override { + out << get_type_name(); + } + + void encode_payload(uint64_t features) override { + paxos_encode(); + } + void decode_payload() override { + bufferlist::iterator p = payload.begin(); + paxos_decode(p); + } +}; + +#endif diff --git a/src/msg/Message.cc b/src/msg/Message.cc index 5579e34825a..8232ba39c43 100644 --- a/src/msg/Message.cc +++ b/src/msg/Message.cc @@ -168,6 +168,7 @@ using namespace std; #include "messages/MMgrReport.h" #include "messages/MMgrOpen.h" #include "messages/MMgrConfigure.h" +#include "messages/MMonMgrReport.h" #include "messages/MLock.h" @@ -746,6 +747,10 @@ Message *decode_message(CephContext *cct, int crcflags, m = new MMgrBeacon(); break; + case MSG_MON_MGR_REPORT: + m = new MMonMgrReport(); + break; + case MSG_MGR_MAP: m = new MMgrMap(); break; diff --git a/src/msg/Message.h b/src/msg/Message.h index b3a836c12d4..b7220e2de28 100644 --- a/src/msg/Message.h +++ b/src/msg/Message.h @@ -196,6 +196,8 @@ // *** ceph-mon(MgrMonitor) -> ceph-mgr #define MSG_MGR_DIGEST 0x705 +// *** cephmgr -> ceph-mon +#define MSG_MON_MGR_REPORT 0x706 // ======================================================