Merge remote-tracking branch 'gh/wip-mon-refactor'

Reviewed-by: Sage Weil <sage@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>

3 files changed, 1 insertions, 120 deletions

diff --git a/src/messages/MLog.h b/src/messages/MLog.h
index 61ca18b6944..b7d902d5f44 100644
--- a/src/messages/MLog.h
+++ b/src/messages/MLog.h
@@ -29,7 +29,7 @@ public:
   MLog() : PaxosServiceMessage(MSG_LOG, 0) {}
   MLog(uuid_d& f, const std::deque<LogEntry>& e)
     : PaxosServiceMessage(MSG_LOG, 0), fsid(f), entries(e) { }
-  MLog(uuid_d& f) : PaxosServiceMessage(MSG_LOG, 0), fsid(f) {}
+  MLog(uuid_d& f) : PaxosServiceMessage(MSG_LOG, 0), fsid(f) { }
 private:
   ~MLog() {}
 
diff --git a/src/messages/MMonObserve.h b/src/messages/MMonObserve.h
deleted file mode 100644
index 1228129c16f..00000000000
--- a/src/messages/MMonObserve.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) 2004-2006 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 CEPH_MMONOBSERVE_H
-#define CEPH_MMONOBSERVE_H
-
-#include "msg/Message.h"
-
-#include <vector>
-using std::vector;
-
-class MMonObserve : public PaxosServiceMessage {
- public:
-  uuid_d fsid;
-  uint32_t machine_id;
-  version_t ver;
-
-  MMonObserve() : PaxosServiceMessage(MSG_MON_OBSERVE, 0) {}
-  MMonObserve(uuid_d &f, int mid, version_t v) : 
-    PaxosServiceMessage(MSG_MON_OBSERVE, v),
-    fsid(f), machine_id(mid), ver(v) { }
-private:
-  ~MMonObserve() {}
-  
-public:
-  const char *get_type_name() const { return "mon_observe"; }
-  void print(ostream& o) const {
-    o << "observe(" << machine_id << " v" << ver << ")";
-  }
-  
-  void encode_payload(uint64_t features) {
-    paxos_encode();
-    ::encode(fsid, payload);
-    ::encode(machine_id, payload);
-    ::encode(ver, payload);
-  }
-  void decode_payload() {
-    bufferlist::iterator p = payload.begin();
-    paxos_decode(p);
-    ::decode(fsid, p);
-    ::decode(machine_id, p);
-    ::decode(ver, p);
-  }
-};
-
-#endif
diff --git a/src/messages/MMonObserveNotify.h b/src/messages/MMonObserveNotify.h
deleted file mode 100644
index 794cf141d7b..00000000000
--- a/src/messages/MMonObserveNotify.h
+++ /dev/null
@@ -1,62 +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) 2004-2006 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 CEPH_MMONOBSERVENOTIFY_H
-#define CEPH_MMONOBSERVENOTIFY_H
-
-#include "msg/Message.h"
-
-class MMonObserveNotify : public PaxosServiceMessage {
- public:
-  uuid_d fsid;
-  int32_t machine_id;
-  bufferlist bl;
-  version_t ver;
-  bool is_latest;
-  
-  MMonObserveNotify() : PaxosServiceMessage(MSG_MON_OBSERVE_NOTIFY, 0) {}
-  MMonObserveNotify(uuid_d& f, int id, bufferlist& b, version_t v, bool l) :
-    PaxosServiceMessage(MSG_MON_OBSERVE_NOTIFY, v), fsid(f), machine_id(id), bl(b), ver(v), is_latest(l) {}
-private:
-  ~MMonObserveNotify() {}
-
-public:  
-  const char *get_type_name() const { return "mon_observe_notify"; }
-  void print(ostream& o) const {
-    o << "mon_observe_notify(v" << ver << " " << bl.length() << " bytes";
-    if (is_latest)
-      o << " latest";
-    o << " v" << version << ")";
-  }
-  
-  void encode_payload(uint64_t features) {
-    paxos_encode();
-    ::encode(fsid, payload);
-    ::encode(machine_id, payload);
-    ::encode(bl, payload);
-    ::encode(ver, payload);
-    ::encode(is_latest, payload);
-  }
-  void decode_payload() {
-    bufferlist::iterator p = payload.begin();
-    paxos_decode(p);
-    ::decode(fsid, p);
-    ::decode(machine_id, p);
-    ::decode(bl, p);
-    ::decode(ver, p);
-    ::decode(is_latest, p);
-  }
-};
-
-#endif