diff --git a/src/messages/MOSDPGMissing.h b/src/messages/MOSDPGMissing.h deleted file mode 100644 index b931b36353f..00000000000 --- a/src/messages/MOSDPGMissing.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) 2010 Dreamhost - * - * 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_MOSDPGMISSING_H -#define CEPH_MOSDPGMISSING_H - -#include "msg/Message.h" - -class MOSDPGMissing : public Message { - epoch_t epoch; - -public: - pg_info_t info; - pg_missing_t missing; - - epoch_t get_epoch() { return epoch; } - - MOSDPGMissing() : Message(MSG_OSD_PG_MISSING) {} - MOSDPGMissing(version_t mv, const pg_info_t &info_, - const pg_missing_t &missing_) - : Message(MSG_OSD_PG_MISSING), epoch(mv), info(info_), - missing(missing_) { } -private: - ~MOSDPGMissing() {} - -public: - const char *get_type_name() const { return "pg_missing"; } - void print(ostream& out) const { - out << "pg_missing(" << info.pgid << " e" << epoch << ")"; - } - - void encode_payload(uint64_t features) { - ::encode(epoch, payload); - ::encode(info, payload); - ::encode(missing, payload); - } - void decode_payload() { - bufferlist::iterator p = payload.begin(); - ::decode(epoch, p); - ::decode(info, p); - missing.decode(p, info.pgid.pool()); - } -}; - -#endif diff --git a/src/msg/Message.cc b/src/msg/Message.cc index a226ecbca72..26c91eef093 100644 --- a/src/msg/Message.cc +++ b/src/msg/Message.cc @@ -77,7 +77,6 @@ using namespace std; #include "messages/MOSDPGInfo.h" #include "messages/MOSDPGCreate.h" #include "messages/MOSDPGTrim.h" -#include "messages/MOSDPGMissing.h" #include "messages/MOSDScrub.h" #include "messages/MOSDRepScrub.h" #include "messages/MOSDPGScan.h" @@ -501,9 +500,6 @@ Message *decode_message(CephContext *cct, int crcflags, case MSG_REMOVE_SNAPS: m = new MRemoveSnaps; break; - case MSG_OSD_PG_MISSING: - m = new MOSDPGMissing; - break; case MSG_OSD_REP_SCRUB: m = new MOSDRepScrub; break; diff --git a/src/msg/Message.h b/src/msg/Message.h index 680f4a0aeae..e103f793668 100644 --- a/src/msg/Message.h +++ b/src/msg/Message.h @@ -85,7 +85,7 @@ #define MSG_REMOVE_SNAPS 90 #define MSG_OSD_SCRUB 91 -#define MSG_OSD_PG_MISSING 92 +//#define MSG_OSD_PG_MISSING 92 // obsolete #define MSG_OSD_REP_SCRUB 93 #define MSG_OSD_PG_SCAN 94 diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index c645424ec1f..5cc7eca5390 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -85,7 +85,6 @@ #include "messages/MOSDPGTrim.h" #include "messages/MOSDPGScan.h" #include "messages/MOSDPGBackfill.h" -#include "messages/MOSDPGMissing.h" #include "messages/MBackfillReserve.h" #include "messages/MRecoveryReserve.h" #include "messages/MOSDECSubOpWrite.h" @@ -6384,11 +6383,6 @@ void OSD::dispatch_op(OpRequestRef op) case MSG_OSD_PG_TRIM: handle_pg_trim(op); break; - case MSG_OSD_PG_MISSING: - assert(0 == - "received MOSDPGMissing; this message is supposed to be unused!?!"); - break; - case MSG_OSD_BACKFILL_RESERVE: handle_pg_backfill_reserve(op); break; diff --git a/src/osd/OSD.h b/src/osd/OSD.h index c0081b07835..3beb717e419 100644 --- a/src/osd/OSD.h +++ b/src/osd/OSD.h @@ -213,7 +213,6 @@ class ObjectStore; class FuseStore; class OSDMap; class MLog; -class MOSDPGMissing; class Objecter; class Watch; diff --git a/src/test/encoding/types.h b/src/test/encoding/types.h index c0d43b9d46a..3616f88233e 100644 --- a/src/test/encoding/types.h +++ b/src/test/encoding/types.h @@ -558,8 +558,6 @@ MESSAGE(MOSDPGCreate) MESSAGE(MOSDPGInfo) #include "messages/MOSDPGLog.h" MESSAGE(MOSDPGLog) -#include "messages/MOSDPGMissing.h" -MESSAGE(MOSDPGMissing) #include "messages/MOSDPGNotify.h" MESSAGE(MOSDPGNotify) #include "messages/MOSDPGQuery.h"