msgr: ping needs no payload. lose ping_ack.

They were unused/ignored.

diff --git a/src/Makefile.am b/src/Makefile.am
index 1f203bee258af3196728b3200a800c8122e0ae50..c704285dd51257d889f7e8c88f7c9e8ccee5f12c 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -468,7 +468,6 @@ noinst_HEADERS = \
         messages/MPGStats.h\
         messages/MPGStatsAck.h\
         messages/MPing.h\
-        messages/MPingAck.h\
         messages/MRemoveSnaps.h\
         messages/MStatfs.h\
         messages/MStatfsReply.h\

diff --git a/src/include/ceph_fs.h b/src/include/ceph_fs.h
index 4e7db817736470ba1ed9402276b11dd0718f4228..96f9d791ace6429b49afda0e7d21740e1be4a1ee 100644 (file)
--- a/src/include/ceph_fs.h
+++ b/src/include/ceph_fs.h
@@ -441,7 +441,6 @@ struct ceph_msg_footer {
 /* misc */
 #define CEPH_MSG_SHUTDOWN               1
 #define CEPH_MSG_PING                   2
-#define CEPH_MSG_PING_ACK               3
 
 /* client <-> monitor */
 #define CEPH_MSG_MON_MAP                4
@@ -472,12 +471,6 @@ struct ceph_msg_footer {
 #define CEPH_MSG_OSD_OPREPLY      43
 
 
-struct ceph_ping {
-       __le64 seq;
-       struct ceph_timespec stamp;
-};
-
-
 /* for statfs_reply.  units are KB, objects. */
 struct ceph_statfs {
        __le64 f_total;

diff --git a/src/messages/MPing.h b/src/messages/MPing.h
index 054627d5c5574a2fdd2662749ff9dc918bc953ed..a065c69d3499b84dd5a48652b56c2a0e378656b6 100644 (file)
--- a/src/messages/MPing.h
+++ b/src/messages/MPing.h
@@ -22,24 +22,10 @@
 
 class MPing : public Message {
  public:
-  __u64 seq;
-  utime_t stamp;
-  MPing(int s, utime_t w) : Message(CEPH_MSG_PING) {
-    seq = s;
-    stamp = w;
-  }
   MPing() : Message(CEPH_MSG_PING) {}
 
-  void decode_payload() {
-    bufferlist::iterator p = payload.begin();
-    ::decode(seq, p);
-    ::decode(stamp, p);
-  }
-  void encode_payload() {
-    ::encode(seq, payload);
-    ::encode(stamp, payload);
-  }
-
+  void decode_payload() { }
+  void encode_payload() { }
   const char *get_type_name() { return "ping"; }
 };
 

diff --git a/src/messages/MPingAck.h b/src/messages/MPingAck.h
deleted file mode 100644 (file)
index 45493e6..0000000
--- a/src/messages/MPingAck.h
+++ /dev/null
@@ -1,50 +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 __MPINGACK_H
-#define __MPINGACK_H
-
-#include "MPing.h"
-
-
-class MPingAck : public Message {
- public:
-  __u64 seq;
-  utime_t sender_stamp;
-  utime_t reply_stamp;
-
-  MPingAck() {}
-  MPingAck(MPing *p, utime_t w) : Message(CEPH_MSG_PING_ACK) {
-    seq = p->seq;
-    sender_stamp = p->stamp;
-    reply_stamp = w;
-  }
-
-  void decode_payload() {
-    bufferlist::iterator p = payload.begin();
-    ::decode(seq, p);
-    ::decode(sender_stamp, p);
-    ::decode(reply_stamp, p);
-  }
-  void encode_payload() {
-    ::encode(seq, payload);
-    ::encode(sender_stamp, payload);
-    ::encode(reply_stamp, payload);
-  }
-
-  const char *get_type_name() { return "pinga"; }
-};
-
-#endif

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index de08031c5ee8b16d2487098d93c3c7d05f813916..55746159945ba42919130b25aea5f90dc0acff53 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -23,8 +23,6 @@
 #include "msg/Message.h"
 #include "msg/Messenger.h"
 
-#include "messages/MPing.h"
-#include "messages/MPingAck.h"
 #include "messages/MMonMap.h"
 #include "messages/MMonGetMap.h"
 #include "messages/MGenericMessage.h"
@@ -314,10 +312,6 @@ void Monitor::dispatch(Message *m)
       handle_mon_get_map((MMonGetMap*)m);
       break;
 
-    case CEPH_MSG_PING_ACK:
-      handle_ping_ack((MPingAck*)m);
-      break;
-      
     case CEPH_MSG_SHUTDOWN:
       if (m->get_source().is_osd()) 
        osdmon->dispatch(m);
@@ -450,12 +444,6 @@ void Monitor::handle_shutdown(Message *m)
   delete m;
 }
 
-void Monitor::handle_ping_ack(MPingAck *m)
-{
-  // ...
-  
-  delete m;
-}
 
 
 

diff --git a/src/mon/Monitor.h b/src/mon/Monitor.h
index 81b3742866142915d5820c79173734456df3953b..9acceccaf4f577ade97e84d1309a147e8449aaed 100644 (file)
--- a/src/mon/Monitor.h
+++ b/src/mon/Monitor.h
@@ -122,7 +122,6 @@ public:
   // messages
   void handle_mon_get_map(MMonGetMap *m);
   void handle_shutdown(Message *m);
-  void handle_ping_ack(class MPingAck *m);
   void handle_command(class MMonCommand *m);
 
   void reply_command(MMonCommand *m, int rc, const string &rs);

diff --git a/src/msg/Message.cc b/src/msg/Message.cc
index 213dab4fe220cd99854c53e7a4bb393cabdae0f1..aa3d4f9b3b62e07f383fcac121f5ed5ba73b24fa 100644 (file)
--- a/src/msg/Message.cc
+++ b/src/msg/Message.cc
@@ -23,7 +23,6 @@ using namespace std;
 #include "messages/MMonElection.h"
 
 #include "messages/MPing.h"
-#include "messages/MPingAck.h"
 
 #include "messages/MOSDBoot.h"
 #include "messages/MOSDAlive.h"
@@ -169,9 +168,6 @@ decode_message(ceph_msg_header& header, ceph_msg_footer& footer,
   case CEPH_MSG_PING:
     m = new MPing();
     break;
-  case CEPH_MSG_PING_ACK:
-    m = new MPingAck();
-    break;
     
   case CEPH_MSG_MON_MAP:
     m = new MMonMap;

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index e631d0966c8bb1aae5d3141a239d1caac6b6148a..c0fee4622eea6ca0be0fdd324a8b54790a9e957e 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -38,7 +38,6 @@
 
 #include "messages/MGenericMessage.h"
 #include "messages/MPing.h"
-#include "messages/MPingAck.h"
 #include "messages/MOSDPing.h"
 #include "messages/MOSDFailure.h"
 #include "messages/MOSDOp.h"