From: Yan, Zheng <zheng.z.yan@intel.com>
Date: Thu, 19 Jun 2014 12:56:15 +0000 (+0800)
Subject: mds: add get_metablob() to log events
X-Git-Tag: v0.84~138^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a17462c84b24f9a8d1d3d0b516fa25e46fffa7f7;p=ceph.git

mds: add get_metablob() to log events

later commits will use it to get EMetaBlob and update EMetaBlob's
event sequence number.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
---

diff --git a/src/mds/LogEvent.h b/src/mds/LogEvent.h
index 67c22e75233..145c69acf49 100644
--- a/src/mds/LogEvent.h
+++ b/src/mds/LogEvent.h
@@ -115,7 +115,7 @@ public:
    * If the subclass embeds a MetaBlob, return it here so that
    * tools can examine metablobs while traversing lists of LogEvent.
    */
-  virtual EMetaBlob const *get_metablob() const {return NULL;}
+  virtual EMetaBlob *get_metablob() { return NULL; }
 };
 
 inline ostream& operator<<(ostream& out, LogEvent& le) {
diff --git a/src/mds/events/EExport.h b/src/mds/events/EExport.h
index 082e14babb8..1cab674fa42 100644
--- a/src/mds/events/EExport.h
+++ b/src/mds/events/EExport.h
@@ -42,6 +42,8 @@ public:
     out << "EExport " << base << " " << metablob;
   }
 
+  EMetaBlob *get_metablob() { return &metablob; }
+
   void encode(bufferlist& bl) const;
   void decode(bufferlist::iterator &bl);
   void dump(Formatter *f) const;
diff --git a/src/mds/events/EFragment.h b/src/mds/events/EFragment.h
index 8869137bcc6..56f548585a3 100644
--- a/src/mds/events/EFragment.h
+++ b/src/mds/events/EFragment.h
@@ -68,6 +68,8 @@ public:
       ::encode(*drb, rollback);
   }
 
+  EMetaBlob *get_metablob() { return &metablob; }
+
   void encode(bufferlist &bl) const;
   void decode(bufferlist::iterator &bl);
   void dump(Formatter *f) const;
diff --git a/src/mds/events/EImportStart.h b/src/mds/events/EImportStart.h
index 0f55190139c..17d0bdd293e 100644
--- a/src/mds/events/EImportStart.h
+++ b/src/mds/events/EImportStart.h
@@ -43,6 +43,8 @@ protected:
   void print(ostream& out) const {
     out << "EImportStart " << base << " " << metablob;
   }
+
+  EMetaBlob *get_metablob() { return &metablob; }
   
   void encode(bufferlist &bl) const;
   void decode(bufferlist::iterator &bl);
diff --git a/src/mds/events/EOpen.h b/src/mds/events/EOpen.h
index d1c41558b40..207b32b8010 100644
--- a/src/mds/events/EOpen.h
+++ b/src/mds/events/EOpen.h
@@ -31,6 +31,8 @@ public:
     out << "EOpen " << metablob << ", " << inos.size() << " open files";
   }
 
+  EMetaBlob *get_metablob() { return &metablob; }
+
   void add_clean_inode(CInode *in) {
     if (!in->is_base()) {
       metablob.add_dir_context(in->get_projected_parent_dn()->get_dir());
@@ -49,7 +51,6 @@ public:
 
   void update_segment();
   void replay(MDS *mds);
-  EMetaBlob const *get_metablob() const {return &metablob;}
 };
 
 #endif
diff --git a/src/mds/events/ESlaveUpdate.h b/src/mds/events/ESlaveUpdate.h
index b45351ae732..9745139339a 100644
--- a/src/mds/events/ESlaveUpdate.h
+++ b/src/mds/events/ESlaveUpdate.h
@@ -136,6 +136,8 @@ public:
     out << commit;
   }
 
+  EMetaBlob *get_metablob() { return &commit; }
+
   void encode(bufferlist& bl) const;
   void decode(bufferlist::iterator& bl);
   void dump(Formatter *f) const;
diff --git a/src/mds/events/ESubtreeMap.h b/src/mds/events/ESubtreeMap.h
index 32a4abe5180..1349dfce911 100644
--- a/src/mds/events/ESubtreeMap.h
+++ b/src/mds/events/ESubtreeMap.h
@@ -33,6 +33,8 @@ public:
 	<< metablob;
   }
 
+  EMetaBlob *get_metablob() { return &metablob; }
+
   void encode(bufferlist& bl) const;
   void decode(bufferlist::iterator& bl);
   void dump(Formatter *f) const;
diff --git a/src/mds/events/EUpdate.h b/src/mds/events/EUpdate.h
index d6d82410c14..d3455e15cd0 100644
--- a/src/mds/events/EUpdate.h
+++ b/src/mds/events/EUpdate.h
@@ -38,6 +38,8 @@ public:
     out << metablob;
   }
 
+  EMetaBlob *get_metablob() { return &metablob; }
+
   void encode(bufferlist& bl) const;
   void decode(bufferlist::iterator& bl);
   void dump(Formatter *f) const;