message: Add a new MMonAdd message type

diff --git a/src/Makefile.am b/src/Makefile.am
index 19e6168934c6d4ffb9a29e5fe1eb61b1df646752..bbe9091891a49f25d412e6136f1f541eefc312dd 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -570,6 +570,7 @@ noinst_HEADERS = \
         messages/MMonObserve.h\
         messages/MMonObserveNotify.h\
         messages/MMonPaxos.h\
+       messages/MMonAdd.h\
         messages/MMonSubscribe.h\
         messages/MMonSubscribeAck.h\
         messages/MOSDAlive.h\

diff --git a/src/messages/MMonAdd.h b/src/messages/MMonAdd.h
new file mode 100644 (file)
index 0000000..fe5096c
--- /dev/null
+++ b/src/messages/MMonAdd.h
@@ -0,0 +1,47 @@
+// -*- 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) 2009 Sage Weil <sage@newdream.net>
+ *
+ * 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 __MMONADD_H
+#define __MMONADD_H
+
+#include "msg/Message.h"
+#include "include/types.h"
+
+#include "mon/MonMap.h"
+#include "config.h"
+
+class MMonAdd : public Message {
+ public:
+  entity_addr_t address;
+
+  MMonAdd() : Message(MSG_MON_ADD) {}
+  MMonAdd(const char *ip) : Message(MSG_MON_ADD) {
+    parse_ip_port(ip, address);}
+  MMonAdd(const struct entity_addr_t& addr) :
+    Message(MSG_MON_ADD), address(addr) {}
+
+  const char* get_type_name() { return "mon_add"; }
+  void print (ostream& o) { o << "mon_add(" << address << ")"; }
+
+  void decode_payload() {
+    bufferlist::iterator p = payload.begin();
+    ::decode(address, p);
+  }
+
+  void encode_payload() {
+    ::encode(address, payload);
+  }
+};
+
+#endif

diff --git a/src/msg/Message.cc b/src/msg/Message.cc
index 337eeb6a563e671e6f7e9eeb7c1d861458474f08..ba235d33f1a0ad014deed0648f684810de9967e2 100644 (file)
--- a/src/msg/Message.cc
+++ b/src/msg/Message.cc
@@ -26,6 +26,7 @@ using namespace std;
 #include "messages/MMonCommand.h"
 #include "messages/MMonCommandAck.h"
 #include "messages/MMonPaxos.h"
+#include "messages/MMonAdd.h"
 #include "messages/MMonObserve.h"
 #include "messages/MMonObserveNotify.h"
 
@@ -218,6 +219,9 @@ Message *decode_message(ceph_msg_header& header, ceph_msg_footer& footer,
   case MSG_MON_PAXOS:
     m = new MMonPaxos;
     break;
+  case MSG_MON_ADD:
+    m = new MMonAdd;
+    break;
 
   case MSG_MON_ELECTION:
     m = new MMonElection;

diff --git a/src/msg/Message.h b/src/msg/Message.h
index 4acadc195e69ceeaa7ed90b060138d966ef442b0..ac13c0f9143a059b52b798fc04832e8564537786 100644 (file)
--- a/src/msg/Message.h
+++ b/src/msg/Message.h
@@ -22,7 +22,7 @@
 // monitor internal
 #define MSG_MON_ELECTION           60
 #define MSG_MON_PAXOS              61
-
+#define MSG_MON_ADD                62
 /* monitor <-> mon admin tool */
 #define MSG_MON_COMMAND            50
 #define MSG_MON_COMMAND_ACK        51