mds: remove unused EString event

While we're at it, #include LogEvent.h from each of
the log events, some of which didn't include it previously!

Signed-off-by: Greg Farnum <greg@inktank.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index 142daea072503e3f7b6e7acaf359b68cc0cd01dd..fe75b038ac27bb36fe89e3947e1d1c7b1730b65c 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1707,7 +1707,6 @@ noinst_HEADERS = \
         mds/events/ESession.h\
         mds/events/ESessions.h\
         mds/events/ESlaveUpdate.h\
-        mds/events/EString.h\
         mds/events/ESubtreeMap.h\
        mds/events/ETableClient.h\
        mds/events/ETableServer.h\

diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc
index 4d4d63576e946a4fb43046a217f0722a0f28a02b..d2ba41a4d76f5c123939e01fba8057d82eb7fc21 100644 (file)
--- a/src/mds/Locker.cc
+++ b/src/mds/Locker.cc
@@ -26,7 +26,6 @@
 
 #include "include/filepath.h"
 
-#include "events/EString.h"
 #include "events/EUpdate.h"
 #include "events/EOpen.h"
 

diff --git a/src/mds/LogEvent.cc b/src/mds/LogEvent.cc
index 0c3b965f86a3acceb01f6a242846c6d0158ea9e8..cee838820efeb4be2358ecc9421e824dd35b71c6 100644 (file)
--- a/src/mds/LogEvent.cc
+++ b/src/mds/LogEvent.cc
@@ -18,8 +18,6 @@
 #include "MDS.h"
 
 // events i know of
-#include "events/EString.h"
-
 #include "events/ESubtreeMap.h"
 #include "events/EExport.h"
 #include "events/EImportStart.h"
@@ -52,8 +50,6 @@ LogEvent *LogEvent::decode(bufferlist& bl)
   // create event
   LogEvent *le;
   switch (type) {
-  case EVENT_STRING: le = new EString; break;
-
   case EVENT_SUBTREEMAP: le = new ESubtreeMap; break;
   case EVENT_SUBTREEMAP_TEST: 
     le = new ESubtreeMap;

diff --git a/src/mds/LogEvent.h b/src/mds/LogEvent.h
index e0b4bea4dc62b9e03b56b349ece8faa9c2ec874a..9ff5cb85f63f7ae10566caa752fd3856c29d0d49 100644 (file)
--- a/src/mds/LogEvent.h
+++ b/src/mds/LogEvent.h
@@ -15,7 +15,7 @@
 #ifndef CEPH_LOGEVENT_H
 #define CEPH_LOGEVENT_H
 
-#define EVENT_STRING       1
+#define EVENT_UNUSED       1 // was previously EVENT_STRING
 
 #define EVENT_SUBTREEMAP   2
 #define EVENT_EXPORT       3

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index dee4d2565bdbed6e7fdf72cb3f49e7858e0e6a57..2c48d375af88eea66f71a4f24b9fe6b193af3ea3 100644 (file)
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -51,7 +51,6 @@
 #include "events/ESubtreeMap.h"
 #include "events/EUpdate.h"
 #include "events/ESlaveUpdate.h"
-#include "events/EString.h"
 #include "events/EImportFinish.h"
 #include "events/EFragment.h"
 #include "events/ECommitted.h"

diff --git a/src/mds/Migrator.cc b/src/mds/Migrator.cc
index 3449306d64a9816c2a2e1650daa09eb4527dc49f..123986908a1c6340407b59a02685c00aabecf0aa 100644 (file)
--- a/src/mds/Migrator.cc
+++ b/src/mds/Migrator.cc
@@ -27,7 +27,6 @@
 
 #include "include/filepath.h"
 
-#include "events/EString.h"
 #include "events/EExport.h"
 #include "events/EImportStart.h"
 #include "events/EImportFinish.h"

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index 2028acd7a81c148e60776d172dfa3b60da99f833..515dbfa3f9b5ec20121918b8646ab9efa15cabff 100644 (file)
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -42,7 +42,6 @@
 
 #include "messages/MDentryUnlink.h"
 
-#include "events/EString.h"
 #include "events/EUpdate.h"
 #include "events/ESlaveUpdate.h"
 #include "events/ESession.h"

diff --git a/src/mds/events/EExport.h b/src/mds/events/EExport.h
index 534621d044919b6f2bf650137ca88940922519e5..645c790b22d6ec58de1c6fa50a0daa005fa0d96a 100644 (file)
--- a/src/mds/events/EExport.h
+++ b/src/mds/events/EExport.h
@@ -21,6 +21,7 @@
 #include "../MDS.h"
 
 #include "EMetaBlob.h"
+#include "../LogEvent.h"
 
 class EExport : public LogEvent {
 public:

diff --git a/src/mds/events/EImportFinish.h b/src/mds/events/EImportFinish.h
index f8c8b39838d86e88ef7c32326275946a3b5ec48d..85f0eb16cabb2d2fa884fabf2334a97ff04faf7b 100644 (file)
--- a/src/mds/events/EImportFinish.h
+++ b/src/mds/events/EImportFinish.h
@@ -19,6 +19,7 @@
 #include "include/types.h"
 
 #include "../MDS.h"
+#include "../LogEvent.h"
 
 class EImportFinish : public LogEvent {
  protected:

diff --git a/src/mds/events/EImportStart.h b/src/mds/events/EImportStart.h
index 0d5f275e0ec1f6a9bb77bf44a17d0fa6fbe38487..eaf606a9fcf5c96bed3d871a105563bb681936f3 100644 (file)
--- a/src/mds/events/EImportStart.h
+++ b/src/mds/events/EImportStart.h
@@ -21,6 +21,7 @@
 #include "../MDS.h"
 
 #include "EMetaBlob.h"
+#include "../LogEvent.h"
 
 class EImportStart : public LogEvent {
 protected:

diff --git a/src/mds/events/EString.h b/src/mds/events/EString.h
deleted file mode 100644 (file)
index aa50514..0000000
--- a/src/mds/events/EString.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_ESTRING_H
-#define CEPH_ESTRING_H
-
-#include <stdlib.h>
-#include <string>
-using namespace std;
-
-#include "../LogEvent.h"
-
-// generic log event
-class EString : public LogEvent {
- protected:
-  string event;
-
- public:
-  EString(string e) :
-    LogEvent(EVENT_STRING) {
-    event = e;
-  }
-  EString() :
-    LogEvent(EVENT_STRING) {
-  }
-
-  void encode(bufferlist& bl) const {
-    ::encode(event, bl);
-    ::encode(stamp, bl);
-  }
-  void decode(bufferlist::iterator &bl) {
-    ::decode(event, bl);
-    if (!bl.end())
-      ::decode(stamp, bl);
-  }
-
-  void print(ostream& out) {
-    out << '"' << event << '"';
-  }
-
-  void replay(MDS *mds);
-
-};
-
-#endif

diff --git a/src/mds/journal.cc b/src/mds/journal.cc
index 6c3977584e768aa1e9e0b23301384a28e1471e67..f828571e414a7f738e8bc158418d46a69eae1b5c 100644 (file)
--- a/src/mds/journal.cc
+++ b/src/mds/journal.cc
@@ -14,7 +14,6 @@
 
 #include "common/config.h"
 #include "osdc/Journaler.h"
-#include "events/EString.h"
 #include "events/ESubtreeMap.h"
 #include "events/ESession.h"
 #include "events/ESessions.h"
@@ -266,16 +265,6 @@ void LogSegment::try_to_expire(MDS *mds, C_GatherBuilder &gather_bld)
 #define DOUT_COND(cct, l) (l<=cct->_conf->debug_mds || l <= cct->_conf->debug_mds_log)
 
 
-// -----------------------
-// EString
-
-void EString::replay(MDS *mds)
-{
-  dout(10) << "EString.replay " << event << dendl; 
-}
-
-
-
 // -----------------------
 // EMetaBlob