From: Jos Collin <jcollin@redhat.com>
Date: Tue, 24 Dec 2019 10:48:58 +0000 (+0530)
Subject: mds: MDS-MDS message classes inherit from MMDSOp
X-Git-Tag: v16.1.0~1909^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8214c4272035ccbf67c938baa56a7dc0b4528c85;p=ceph.git

mds: MDS-MDS message classes inherit from MMDSOp

Fixes: https://tracker.ceph.com/issues/41565
Signed-off-by: Jos Collin <jcollin@redhat.com>
---

diff --git a/src/messages/MCacheExpire.h b/src/messages/MCacheExpire.h
index 8cd5d796a82b..aea1aa811e43 100644
--- a/src/messages/MCacheExpire.h
+++ b/src/messages/MCacheExpire.h
@@ -16,12 +16,10 @@
 #define CEPH_MCACHEEXPIRE_H
 
 #include <string_view>
-
-#include "msg/Message.h"
-
 #include "mds/mdstypes.h"
+#include "messages/MMDSOp.h"
 
-class MCacheExpire : public SafeMessage {
+class MCacheExpire : public MMDSOp {
 private:
   __s32 from;
 
@@ -66,9 +64,9 @@ public:
   int get_from() const { return from; }
 
 protected:
-  MCacheExpire() : SafeMessage{MSG_MDS_CACHEEXPIRE}, from(-1) {}
+  MCacheExpire() : MMDSOp{MSG_MDS_CACHEEXPIRE}, from(-1) {}
   MCacheExpire(int f) :
-    SafeMessage{MSG_MDS_CACHEEXPIRE},
+    MMDSOp{MSG_MDS_CACHEEXPIRE},
     from(f) { }
   ~MCacheExpire() override {}
 
diff --git a/src/messages/MClientRequest.h b/src/messages/MClientRequest.h
index 204f1e711978..135958a76043 100644
--- a/src/messages/MClientRequest.h
+++ b/src/messages/MClientRequest.h
@@ -35,10 +35,10 @@
 
 #include <string_view>
 
-#include "msg/Message.h"
 #include "include/filepath.h"
 #include "mds/mdstypes.h"
 #include "include/ceph_features.h"
+#include "messages/MMDSOp.h"
 
 #include <sys/types.h>
 #include <utime.h>
@@ -48,7 +48,7 @@
 
 // metadata ops.
 
-class MClientRequest : public SafeMessage {
+class MClientRequest : public MMDSOp {
 private:
   static constexpr int HEAD_VERSION = 4;
   static constexpr int COMPAT_VERSION = 1;
@@ -89,9 +89,9 @@ public:
 protected:
   // cons
   MClientRequest()
-    : SafeMessage(CEPH_MSG_CLIENT_REQUEST, HEAD_VERSION, COMPAT_VERSION) {}
+    : MMDSOp(CEPH_MSG_CLIENT_REQUEST, HEAD_VERSION, COMPAT_VERSION) {}
   MClientRequest(int op)
-    : SafeMessage(CEPH_MSG_CLIENT_REQUEST, HEAD_VERSION, COMPAT_VERSION) {
+    : MMDSOp(CEPH_MSG_CLIENT_REQUEST, HEAD_VERSION, COMPAT_VERSION) {
     memset(&head, 0, sizeof(head));
     head.op = op;
   }
diff --git a/src/messages/MDentryLink.h b/src/messages/MDentryLink.h
index 5a1ce9c4e6f6..dded32ed2325 100644
--- a/src/messages/MDentryLink.h
+++ b/src/messages/MDentryLink.h
@@ -18,12 +18,12 @@
 
 #include <string_view>
 
-#include "msg/Message.h"
+#include "messages/MMDSOp.h"
 
-class MDentryLink : public SafeMessage {
+class MDentryLink : public MMDSOp {
 private:
-  static const int HEAD_VERSION = 1;
-  static const int COMPAT_VERSION = 1;
+  static constexpr int HEAD_VERSION = 1;
+  static constexpr int COMPAT_VERSION = 1;
   
   dirfrag_t subtree;
   dirfrag_t dirfrag;
@@ -40,9 +40,9 @@ private:
 
 protected:
   MDentryLink() :
-    SafeMessage(MSG_MDS_DENTRYLINK, HEAD_VERSION, COMPAT_VERSION) { }
+    MMDSOp(MSG_MDS_DENTRYLINK, HEAD_VERSION, COMPAT_VERSION) { }
   MDentryLink(dirfrag_t r, dirfrag_t df, std::string_view n, bool p) :
-    SafeMessage(MSG_MDS_DENTRYLINK, HEAD_VERSION, COMPAT_VERSION),
+    MMDSOp(MSG_MDS_DENTRYLINK, HEAD_VERSION, COMPAT_VERSION),
     subtree(r),
     dirfrag(df),
     dn(n),
diff --git a/src/messages/MDentryUnlink.h b/src/messages/MDentryUnlink.h
index 3037acec43f8..27b46079f534 100644
--- a/src/messages/MDentryUnlink.h
+++ b/src/messages/MDentryUnlink.h
@@ -18,12 +18,12 @@
 
 #include <string_view>
 
-#include "msg/Message.h"
+#include "messages/MMDSOp.h"
 
-class MDentryUnlink : public SafeMessage {
+class MDentryUnlink : public MMDSOp {
 private:
-  static const int HEAD_VERSION = 1;
-  static const int COMPAT_VERSION = 1;
+  static constexpr int HEAD_VERSION = 1;
+  static constexpr int COMPAT_VERSION = 1;
   
   dirfrag_t dirfrag;
   std::string dn;
@@ -37,9 +37,9 @@ private:
 
 protected:
   MDentryUnlink() :
-    SafeMessage(MSG_MDS_DENTRYUNLINK, HEAD_VERSION, COMPAT_VERSION) { }
+    MMDSOp(MSG_MDS_DENTRYUNLINK, HEAD_VERSION, COMPAT_VERSION) { }
   MDentryUnlink(dirfrag_t df, std::string_view n) :
-    SafeMessage(MSG_MDS_DENTRYUNLINK, HEAD_VERSION, COMPAT_VERSION),
+    MMDSOp(MSG_MDS_DENTRYUNLINK, HEAD_VERSION, COMPAT_VERSION),
     dirfrag(df),
     dn(n) {}
   ~MDentryUnlink() override {}
diff --git a/src/messages/MDirUpdate.h b/src/messages/MDirUpdate.h
index 8a2629f19c2f..468d4a0b5cb1 100644
--- a/src/messages/MDirUpdate.h
+++ b/src/messages/MDirUpdate.h
@@ -16,9 +16,9 @@
 #ifndef CEPH_MDIRUPDATE_H
 #define CEPH_MDIRUPDATE_H
 
-#include "msg/Message.h"
+#include "messages/MMDSOp.h"
 
-class MDirUpdate : public SafeMessage {
+class MDirUpdate : public MMDSOp {
 public:
   mds_rank_t get_source_mds() const { return from_mds; }
   dirfrag_t get_dirfrag() const { return dirfrag; }
@@ -58,19 +58,19 @@ public:
 
 protected:
   ~MDirUpdate() {}
-  MDirUpdate() : SafeMessage(MSG_MDS_DIRUPDATE, HEAD_VERSION, COMPAT_VERSION) {}
+  MDirUpdate() : MMDSOp(MSG_MDS_DIRUPDATE, HEAD_VERSION, COMPAT_VERSION) {}
   MDirUpdate(mds_rank_t f,
 	     dirfrag_t dirfrag,
              int dir_rep,
              const std::set<int32_t>& dir_rep_by,
              filepath& path,
              bool discover = false) :
-    SafeMessage(MSG_MDS_DIRUPDATE, HEAD_VERSION, COMPAT_VERSION), from_mds(f), dirfrag(dirfrag),
+    MMDSOp(MSG_MDS_DIRUPDATE, HEAD_VERSION, COMPAT_VERSION), from_mds(f), dirfrag(dirfrag),
     dir_rep(dir_rep), dir_rep_by(dir_rep_by), path(path) {
     this->discover = discover ? 5 : 0;
   }
   MDirUpdate(const MDirUpdate& m)
-  : SafeMessage{MSG_MDS_DIRUPDATE},
+  : MMDSOp{MSG_MDS_DIRUPDATE},
     from_mds(m.from_mds),
     dirfrag(m.dirfrag),
     dir_rep(m.dir_rep),
@@ -89,8 +89,8 @@ protected:
   mutable int tried_discover = 0; // XXX HACK
 
 private:
-  static const int HEAD_VERSION = 1;
-  static const int COMPAT_VERSION = 1;
+  static constexpr int HEAD_VERSION = 1;
+  static constexpr int COMPAT_VERSION = 1;
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
 };
diff --git a/src/messages/MDiscover.h b/src/messages/MDiscover.h
index c821d7bfc6aa..d6d14ad692a1 100644
--- a/src/messages/MDiscover.h
+++ b/src/messages/MDiscover.h
@@ -16,13 +16,13 @@
 #ifndef CEPH_MDISCOVER_H
 #define CEPH_MDISCOVER_H
 
-#include "msg/Message.h"
 #include "include/filepath.h"
+#include "messages/MMDSOp.h"
 
 #include <string>
 
 
-class MDiscover : public SafeMessage {
+class MDiscover : public MMDSOp {
 private:
   static constexpr int HEAD_VERSION = 1;
   static constexpr int COMPAT_VERSION = 1;
@@ -50,14 +50,14 @@ private:
   void set_base_dir_frag(frag_t f) { base_dir_frag = f; }
 
 protected:
-  MDiscover() : SafeMessage(MSG_MDS_DISCOVER, HEAD_VERSION, COMPAT_VERSION) { }
+  MDiscover() : MMDSOp(MSG_MDS_DISCOVER, HEAD_VERSION, COMPAT_VERSION) { }
   MDiscover(inodeno_t base_ino_,
 	    frag_t base_frag_,
 	    snapid_t s,
             filepath& want_path_,
             bool want_base_dir_ = true,
 	    bool path_locked_ = false) :
-    SafeMessage{MSG_MDS_DISCOVER},
+    MMDSOp{MSG_MDS_DISCOVER},
     base_ino(base_ino_),
     base_dir_frag(base_frag_),
     snapid(s),
diff --git a/src/messages/MDiscoverReply.h b/src/messages/MDiscoverReply.h
index 7a491406bd75..f14c156c6999 100644
--- a/src/messages/MDiscoverReply.h
+++ b/src/messages/MDiscoverReply.h
@@ -16,8 +16,8 @@
 #ifndef CEPH_MDISCOVERREPLY_H
 #define CEPH_MDISCOVERREPLY_H
 
-#include "msg/Message.h"
 #include "include/filepath.h"
+#include "messages/MMDSOp.h"
 
 #include <string>
 
@@ -63,7 +63,7 @@
  * 
  */
 
-class MDiscoverReply : public SafeMessage {
+class MDiscoverReply : public MMDSOp {
 private:
   static constexpr int HEAD_VERSION = 2;
   static constexpr int COMPAT_VERSION = 2;
@@ -110,9 +110,9 @@ private:
   void set_base_dir_frag(frag_t df) { base_dir_frag = df; }
 
 protected:
-  MDiscoverReply() : SafeMessage{MSG_MDS_DISCOVERREPLY, HEAD_VERSION, COMPAT_VERSION} { }
+  MDiscoverReply() : MMDSOp{MSG_MDS_DISCOVERREPLY, HEAD_VERSION, COMPAT_VERSION} { }
   MDiscoverReply(const MDiscover &dis) :
-    SafeMessage{MSG_MDS_DISCOVERREPLY, HEAD_VERSION, COMPAT_VERSION},
+    MMDSOp{MSG_MDS_DISCOVERREPLY, HEAD_VERSION, COMPAT_VERSION},
     base_ino(dis.get_base_ino()),
     base_dir_frag(dis.get_base_dir_frag()),
     wanted_base_dir(dis.wants_base_dir()),
@@ -127,7 +127,7 @@ protected:
     header.tid = dis.get_tid();
   }
   MDiscoverReply(dirfrag_t df) :
-    SafeMessage{MSG_MDS_DISCOVERREPLY, HEAD_VERSION, COMPAT_VERSION},
+    MMDSOp{MSG_MDS_DISCOVERREPLY, HEAD_VERSION, COMPAT_VERSION},
     base_ino(df.ino),
     base_dir_frag(df.frag),
     wanted_base_dir(false),
diff --git a/src/messages/MExportCaps.h b/src/messages/MExportCaps.h
index d37851b8783c..1c989a3e66f5 100644
--- a/src/messages/MExportCaps.h
+++ b/src/messages/MExportCaps.h
@@ -16,10 +16,9 @@
 #ifndef CEPH_MEXPORTCAPS_H
 #define CEPH_MEXPORTCAPS_H
 
-#include "msg/Message.h"
+#include "messages/MMDSOp.h"
 
-
-class MExportCaps : public SafeMessage {
+class MExportCaps : public MMDSOp {
 private:
   static constexpr int HEAD_VERSION = 2;
   static constexpr int COMPAT_VERSION = 1;
@@ -32,7 +31,7 @@ public:
 
 protected:
   MExportCaps() :
-    SafeMessage{MSG_MDS_EXPORTCAPS, HEAD_VERSION, COMPAT_VERSION} {}
+    MMDSOp{MSG_MDS_EXPORTCAPS, HEAD_VERSION, COMPAT_VERSION} {}
   ~MExportCaps() override {}
 
 public:
diff --git a/src/messages/MExportCapsAck.h b/src/messages/MExportCapsAck.h
index f5505cdb3653..6e9debc4eb60 100644
--- a/src/messages/MExportCapsAck.h
+++ b/src/messages/MExportCapsAck.h
@@ -16,10 +16,9 @@
 #ifndef CEPH_MEXPORTCAPSACK_H
 #define CEPH_MEXPORTCAPSACK_H
 
-#include "msg/Message.h"
+#include "messages/MMDSOp.h"
 
-
-class MExportCapsAck : public SafeMessage {
+class MExportCapsAck : public MMDSOp {
  static constexpr int HEAD_VERSION = 1;
  static constexpr int COMPAT_VERSION = 1;
 
@@ -29,9 +28,9 @@ public:
 
 protected:
   MExportCapsAck() :
-    SafeMessage{MSG_MDS_EXPORTCAPSACK, HEAD_VERSION, COMPAT_VERSION} {}
+    MMDSOp{MSG_MDS_EXPORTCAPSACK, HEAD_VERSION, COMPAT_VERSION} {}
   MExportCapsAck(inodeno_t i) :
-    SafeMessage{MSG_MDS_EXPORTCAPSACK, HEAD_VERSION, COMPAT_VERSION}, ino(i) {}
+    MMDSOp{MSG_MDS_EXPORTCAPSACK, HEAD_VERSION, COMPAT_VERSION}, ino(i) {}
   ~MExportCapsAck() override {}
 
 public:
diff --git a/src/messages/MExportDir.h b/src/messages/MExportDir.h
index f2663015b859..dd2f535273ba 100644
--- a/src/messages/MExportDir.h
+++ b/src/messages/MExportDir.h
@@ -16,10 +16,9 @@
 #ifndef CEPH_MEXPORTDIR_H
 #define CEPH_MEXPORTDIR_H
 
-#include "msg/Message.h"
+#include "messages/MMDSOp.h"
 
-
-class MExportDir : public SafeMessage {
+class MExportDir : public MMDSOp {
 public:
   dirfrag_t dirfrag;
   ceph::buffer::list export_data;
@@ -27,9 +26,9 @@ public:
   ceph::buffer::list client_map;
 
 protected:
-  MExportDir() : SafeMessage{MSG_MDS_EXPORTDIR} {}
+  MExportDir() : MMDSOp{MSG_MDS_EXPORTDIR} {}
   MExportDir(dirfrag_t df, uint64_t tid) :
-    SafeMessage{MSG_MDS_EXPORTDIR}, dirfrag(df) {
+    MMDSOp{MSG_MDS_EXPORTDIR}, dirfrag(df) {
     set_tid(tid);
   }
   ~MExportDir() override {}
diff --git a/src/messages/MExportDirAck.h b/src/messages/MExportDirAck.h
index fcbd09ad9cf9..0ff131921f9e 100644
--- a/src/messages/MExportDirAck.h
+++ b/src/messages/MExportDirAck.h
@@ -16,9 +16,9 @@
 #define CEPH_MEXPORTDIRACK_H
 
 #include "MExportDir.h"
-#include "msg/Message.h"
+#include "messages/MMDSOp.h"
 
-class MExportDirAck : public SafeMessage {
+class MExportDirAck : public MMDSOp {
 public:
   dirfrag_t dirfrag;
   ceph::buffer::list imported_caps;
@@ -26,9 +26,9 @@ public:
   dirfrag_t get_dirfrag() const { return dirfrag; }
   
 protected:
-  MExportDirAck() : SafeMessage{MSG_MDS_EXPORTDIRACK} {}
+  MExportDirAck() : MMDSOp{MSG_MDS_EXPORTDIRACK} {}
   MExportDirAck(dirfrag_t df, uint64_t tid) :
-    SafeMessage{MSG_MDS_EXPORTDIRACK}, dirfrag(df) {
+    MMDSOp{MSG_MDS_EXPORTDIRACK}, dirfrag(df) {
     set_tid(tid);
   }
   ~MExportDirAck() override {}
diff --git a/src/messages/MExportDirCancel.h b/src/messages/MExportDirCancel.h
index df14a134c458..5c35b449b492 100644
--- a/src/messages/MExportDirCancel.h
+++ b/src/messages/MExportDirCancel.h
@@ -15,22 +15,22 @@
 #ifndef CEPH_MEXPORTDIRCANCEL_H
 #define CEPH_MEXPORTDIRCANCEL_H
 
-#include "msg/Message.h"
 #include "include/types.h"
+#include "messages/MMDSOp.h"
 
-class MExportDirCancel : public SafeMessage {
+class MExportDirCancel : public MMDSOp {
 private:
-  static const int HEAD_VERSION = 1;
-  static const int COMPAT_VERSION = 1;
+  static constexpr int HEAD_VERSION = 1;
+  static constexpr int COMPAT_VERSION = 1;
   dirfrag_t dirfrag;
 
  public:
   dirfrag_t get_dirfrag() const { return dirfrag; }
 
 protected:
-  MExportDirCancel() : SafeMessage{MSG_MDS_EXPORTDIRCANCEL, HEAD_VERSION, COMPAT_VERSION} {}
+  MExportDirCancel() : MMDSOp{MSG_MDS_EXPORTDIRCANCEL, HEAD_VERSION, COMPAT_VERSION} {}
   MExportDirCancel(dirfrag_t df, uint64_t tid) :
-    SafeMessage{MSG_MDS_EXPORTDIRCANCEL, HEAD_VERSION, COMPAT_VERSION}, dirfrag(df) {
+    MMDSOp{MSG_MDS_EXPORTDIRCANCEL, HEAD_VERSION, COMPAT_VERSION}, dirfrag(df) {
     set_tid(tid);
   }
   ~MExportDirCancel() override {}
diff --git a/src/messages/MExportDirDiscover.h b/src/messages/MExportDirDiscover.h
index 62d9a1481e12..90022a764298 100644
--- a/src/messages/MExportDirDiscover.h
+++ b/src/messages/MExportDirDiscover.h
@@ -15,13 +15,13 @@
 #ifndef CEPH_MEXPORTDIRDISCOVER_H
 #define CEPH_MEXPORTDIRDISCOVER_H
 
-#include "msg/Message.h"
 #include "include/types.h"
+#include "messages/MMDSOp.h"
 
-class MExportDirDiscover : public SafeMessage {
+class MExportDirDiscover : public MMDSOp {
 private:
-  static const int HEAD_VERSION = 1;
-  static const int COMPAT_VERSION = 1;
+  static constexpr int HEAD_VERSION = 1;
+  static constexpr int COMPAT_VERSION = 1;
   mds_rank_t from = -1;
   dirfrag_t dirfrag;
   filepath path;
@@ -36,10 +36,10 @@ private:
 
 protected:
   MExportDirDiscover() :     
-    SafeMessage{MSG_MDS_EXPORTDIRDISCOVER, HEAD_VERSION, COMPAT_VERSION},
+    MMDSOp{MSG_MDS_EXPORTDIRDISCOVER, HEAD_VERSION, COMPAT_VERSION},
     started(false) { }
   MExportDirDiscover(dirfrag_t df, filepath& p, mds_rank_t f, uint64_t tid) :
-    SafeMessage{MSG_MDS_EXPORTDIRDISCOVER, HEAD_VERSION, COMPAT_VERSION},
+    MMDSOp{MSG_MDS_EXPORTDIRDISCOVER, HEAD_VERSION, COMPAT_VERSION},
     from(f), dirfrag(df), path(p), started(false) {
     set_tid(tid);
   }
diff --git a/src/messages/MExportDirDiscoverAck.h b/src/messages/MExportDirDiscoverAck.h
index f5f77de75a80..c89a7e65d0c9 100644
--- a/src/messages/MExportDirDiscoverAck.h
+++ b/src/messages/MExportDirDiscoverAck.h
@@ -15,13 +15,13 @@
 #ifndef CEPH_MEXPORTDIRDISCOVERACK_H
 #define CEPH_MEXPORTDIRDISCOVERACK_H
 
-#include "msg/Message.h"
 #include "include/types.h"
+#include "messages/MMDSOp.h"
 
-class MExportDirDiscoverAck : public SafeMessage {
+class MExportDirDiscoverAck : public MMDSOp {
 private:
-  static const int HEAD_VERSION = 1;
-  static const int COMPAT_VERSION = 1;
+  static constexpr int HEAD_VERSION = 1;
+  static constexpr int COMPAT_VERSION = 1;
 
   dirfrag_t dirfrag;
   bool success;
@@ -32,9 +32,9 @@ private:
   bool is_success() const { return success; }
 
 protected:
-  MExportDirDiscoverAck() : SafeMessage{MSG_MDS_EXPORTDIRDISCOVERACK, HEAD_VERSION, COMPAT_VERSION} {}
+  MExportDirDiscoverAck() : MMDSOp{MSG_MDS_EXPORTDIRDISCOVERACK, HEAD_VERSION, COMPAT_VERSION} {}
   MExportDirDiscoverAck(dirfrag_t df, uint64_t tid, bool s=true) :
-    SafeMessage{MSG_MDS_EXPORTDIRDISCOVERACK, HEAD_VERSION, COMPAT_VERSION},
+    MMDSOp{MSG_MDS_EXPORTDIRDISCOVERACK, HEAD_VERSION, COMPAT_VERSION},
     dirfrag(df), success(s) {
     set_tid(tid);
   }
diff --git a/src/messages/MExportDirFinish.h b/src/messages/MExportDirFinish.h
index d9e216759e01..22272d703d4d 100644
--- a/src/messages/MExportDirFinish.h
+++ b/src/messages/MExportDirFinish.h
@@ -15,12 +15,12 @@
 #ifndef CEPH_MEXPORTDIRFINISH_H
 #define CEPH_MEXPORTDIRFINISH_H
 
-#include "msg/Message.h"
+#include "messages/MMDSOp.h"
 
-class MExportDirFinish : public SafeMessage {
+class MExportDirFinish : public MMDSOp {
 private:
-  static const int HEAD_VERSION = 1;
-  static const int COMPAT_VERSION = 1;
+  static constexpr int HEAD_VERSION = 1;
+  static constexpr int COMPAT_VERSION = 1;
 
   dirfrag_t dirfrag;
   bool last;
@@ -31,9 +31,9 @@ private:
   
 protected:
   MExportDirFinish() :
-    SafeMessage{MSG_MDS_EXPORTDIRFINISH, HEAD_VERSION, COMPAT_VERSION}, last(false) {}
+    MMDSOp{MSG_MDS_EXPORTDIRFINISH, HEAD_VERSION, COMPAT_VERSION}, last(false) {}
   MExportDirFinish(dirfrag_t df, bool l, uint64_t tid) :
-    SafeMessage{MSG_MDS_EXPORTDIRFINISH, HEAD_VERSION, COMPAT_VERSION}, dirfrag(df), last(l) {
+    MMDSOp{MSG_MDS_EXPORTDIRFINISH, HEAD_VERSION, COMPAT_VERSION}, dirfrag(df), last(l) {
     set_tid(tid);
   }
   ~MExportDirFinish() override {}
diff --git a/src/messages/MExportDirNotify.h b/src/messages/MExportDirNotify.h
index 5419529589e1..7245abe26d9a 100644
--- a/src/messages/MExportDirNotify.h
+++ b/src/messages/MExportDirNotify.h
@@ -15,12 +15,12 @@
 #ifndef CEPH_MEXPORTDIRNOTIFY_H
 #define CEPH_MEXPORTDIRNOTIFY_H
 
-#include "msg/Message.h"
+#include "messages/MMDSOp.h"
 
-class MExportDirNotify : public SafeMessage {
+class MExportDirNotify : public MMDSOp {
 private:
-  static const int HEAD_VERSION = 1;
-  static const int COMPAT_VERSION = 1;
+  static constexpr int HEAD_VERSION = 1;
+  static constexpr int COMPAT_VERSION = 1;
 
   dirfrag_t base;
   bool ack;
@@ -37,10 +37,10 @@ private:
 
 protected:
   MExportDirNotify() :
-    SafeMessage{MSG_MDS_EXPORTDIRNOTIFY, HEAD_VERSION, COMPAT_VERSION} {}
+    MMDSOp{MSG_MDS_EXPORTDIRNOTIFY, HEAD_VERSION, COMPAT_VERSION} {}
   MExportDirNotify(dirfrag_t i, uint64_t tid, bool a, std::pair<__s32,__s32> oa,
 		   std::pair<__s32,__s32> na) :
-    SafeMessage{MSG_MDS_EXPORTDIRNOTIFY, HEAD_VERSION, COMPAT_VERSION},
+    MMDSOp{MSG_MDS_EXPORTDIRNOTIFY, HEAD_VERSION, COMPAT_VERSION},
     base(i), ack(a), old_auth(oa), new_auth(na) {
     set_tid(tid);
   }
diff --git a/src/messages/MExportDirNotifyAck.h b/src/messages/MExportDirNotifyAck.h
index f9e4a98b0108..d97a109113aa 100644
--- a/src/messages/MExportDirNotifyAck.h
+++ b/src/messages/MExportDirNotifyAck.h
@@ -15,12 +15,12 @@
 #ifndef CEPH_MEXPORTDIRNOTIFYACK_H
 #define CEPH_MEXPORTDIRNOTIFYACK_H
 
-#include "msg/Message.h"
+#include "messages/MMDSOp.h"
 
-class MExportDirNotifyAck : public SafeMessage {
+class MExportDirNotifyAck : public MMDSOp {
 private:
-  static const int HEAD_VERSION = 1;
-  static const int COMPAT_VERSION = 1;
+  static constexpr int HEAD_VERSION = 1;
+  static constexpr int COMPAT_VERSION = 1;
 
   dirfrag_t dirfrag;
   std::pair<__s32,__s32> new_auth;
@@ -31,9 +31,9 @@ private:
   
 protected:
   MExportDirNotifyAck() :
-    SafeMessage{MSG_MDS_EXPORTDIRNOTIFYACK, HEAD_VERSION, COMPAT_VERSION} {}
+    MMDSOp{MSG_MDS_EXPORTDIRNOTIFYACK, HEAD_VERSION, COMPAT_VERSION} {}
   MExportDirNotifyAck(dirfrag_t df, uint64_t tid, std::pair<__s32,__s32> na) :
-    SafeMessage{MSG_MDS_EXPORTDIRNOTIFYACK, HEAD_VERSION, COMPAT_VERSION}, dirfrag(df), new_auth(na) {
+    MMDSOp{MSG_MDS_EXPORTDIRNOTIFYACK, HEAD_VERSION, COMPAT_VERSION}, dirfrag(df), new_auth(na) {
     set_tid(tid);
   }
   ~MExportDirNotifyAck() override {}
diff --git a/src/messages/MExportDirPrep.h b/src/messages/MExportDirPrep.h
index e390b748e016..4c8d8fc45f75 100644
--- a/src/messages/MExportDirPrep.h
+++ b/src/messages/MExportDirPrep.h
@@ -16,13 +16,13 @@
 #ifndef CEPH_MEXPORTDIRPREP_H
 #define CEPH_MEXPORTDIRPREP_H
 
-#include "msg/Message.h"
 #include "include/types.h"
+#include "messages/MMDSOp.h"
 
-class MExportDirPrep : public SafeMessage {
+class MExportDirPrep : public MMDSOp {
 private:
-  static const int HEAD_VERSION = 1;
-  static const int COMPAT_VERSION = 1;
+  static constexpr int HEAD_VERSION = 1;
+  static constexpr int COMPAT_VERSION = 1;
 
   dirfrag_t dirfrag;
 public:
@@ -44,7 +44,7 @@ public:
 protected:
   MExportDirPrep() = default;
   MExportDirPrep(dirfrag_t df, uint64_t tid) :
-    SafeMessage{MSG_MDS_EXPORTDIRPREP, HEAD_VERSION, COMPAT_VERSION},
+    MMDSOp{MSG_MDS_EXPORTDIRPREP, HEAD_VERSION, COMPAT_VERSION},
     dirfrag(df)
   {
     set_tid(tid);
diff --git a/src/messages/MExportDirPrepAck.h b/src/messages/MExportDirPrepAck.h
index e4f036e68983..eec2ad9bb79c 100644
--- a/src/messages/MExportDirPrepAck.h
+++ b/src/messages/MExportDirPrepAck.h
@@ -15,13 +15,13 @@
 #ifndef CEPH_MEXPORTDIRPREPACK_H
 #define CEPH_MEXPORTDIRPREPACK_H
 
-#include "msg/Message.h"
 #include "include/types.h"
+#include "messages/MMDSOp.h"
 
-class MExportDirPrepAck : public SafeMessage {
+class MExportDirPrepAck : public MMDSOp {
 private:
-  static const int HEAD_VERSION = 1;
-  static const int COMPAT_VERSION = 1;
+  static constexpr int HEAD_VERSION = 1;
+  static constexpr int COMPAT_VERSION = 1;
 
   dirfrag_t dirfrag;
   bool success = false;
@@ -31,9 +31,9 @@ private:
 
 protected:
   MExportDirPrepAck() :
-    SafeMessage{MSG_MDS_EXPORTDIRPREPACK, HEAD_VERSION, COMPAT_VERSION} {}
+    MMDSOp{MSG_MDS_EXPORTDIRPREPACK, HEAD_VERSION, COMPAT_VERSION} {}
   MExportDirPrepAck(dirfrag_t df, bool s, uint64_t tid) :
-    SafeMessage{MSG_MDS_EXPORTDIRPREPACK, HEAD_VERSION, COMPAT_VERSION}, dirfrag(df), success(s) {
+    MMDSOp{MSG_MDS_EXPORTDIRPREPACK, HEAD_VERSION, COMPAT_VERSION}, dirfrag(df), success(s) {
     set_tid(tid);
   }
   ~MExportDirPrepAck() override {}
diff --git a/src/messages/MGatherCaps.h b/src/messages/MGatherCaps.h
index e1dbcba8c466..2e0dcd717247 100644
--- a/src/messages/MGatherCaps.h
+++ b/src/messages/MGatherCaps.h
@@ -1,10 +1,10 @@
 #ifndef CEPH_MGATHERCAPS_H
 #define CEPH_MGATHERCAPS_H
 
-#include "msg/Message.h"
+#include "messages/MMDSOp.h"
 
 
-class MGatherCaps : public Message {
+class MGatherCaps : public MMDSOp {
   static constexpr int HEAD_VERSION = 1;
   static constexpr int COMPAT_VERSION = 1;
 
@@ -13,7 +13,7 @@ public:
 
 protected:
   MGatherCaps() :
-    Message{MSG_MDS_GATHERCAPS, HEAD_VERSION, COMPAT_VERSION} {}
+    MMDSOp{MSG_MDS_GATHERCAPS, HEAD_VERSION, COMPAT_VERSION} {}
   ~MGatherCaps() override {}
 
 public:
diff --git a/src/messages/MHeartbeat.h b/src/messages/MHeartbeat.h
index a4d3d3baa8b9..d27406fe316b 100644
--- a/src/messages/MHeartbeat.h
+++ b/src/messages/MHeartbeat.h
@@ -17,10 +17,10 @@
 #define CEPH_MHEARTBEAT_H
 
 #include "include/types.h"
-#include "msg/Message.h"
 #include "common/DecayCounter.h"
+#include "messages/MMDSOp.h"
 
-class MHeartbeat : public Message {
+class MHeartbeat : public MMDSOp {
 private:
   mds_load_t load;
   __s32 beat = 0;
@@ -34,9 +34,9 @@ private:
   std::map<mds_rank_t, float>& get_import_map() { return import_map; }
 
 protected:
-  MHeartbeat() : Message(MSG_MDS_HEARTBEAT), load(DecayRate()) {}
+  MHeartbeat() : MMDSOp(MSG_MDS_HEARTBEAT), load(DecayRate()) {}
   MHeartbeat(mds_load_t& load, int beat)
-    : Message(MSG_MDS_HEARTBEAT),
+    : MMDSOp(MSG_MDS_HEARTBEAT),
       load(load),
       beat(beat)
   {}
diff --git a/src/messages/MInodeFileCaps.h b/src/messages/MInodeFileCaps.h
index bd96489ac7d2..6841d0fa8a0b 100644
--- a/src/messages/MInodeFileCaps.h
+++ b/src/messages/MInodeFileCaps.h
@@ -16,9 +16,9 @@
 #ifndef CEPH_MINODEFILECAPS_H
 #define CEPH_MINODEFILECAPS_H
 
-#include "msg/Message.h"
+#include "messages/MMDSOp.h"
 
-class MInodeFileCaps : public SafeMessage {
+class MInodeFileCaps : public MMDSOp {
 private:
   static constexpr int HEAD_VERSION = 1;
   static constexpr int COMPAT_VERSION = 1;
@@ -30,9 +30,9 @@ public:
   int       get_caps() const { return caps; }
 
 protected:
-  MInodeFileCaps() : SafeMessage(MSG_MDS_INODEFILECAPS, HEAD_VERSION, COMPAT_VERSION) {}
+  MInodeFileCaps() : MMDSOp(MSG_MDS_INODEFILECAPS, HEAD_VERSION, COMPAT_VERSION) {}
   MInodeFileCaps(inodeno_t ino, int caps) :
-    SafeMessage(MSG_MDS_INODEFILECAPS, HEAD_VERSION, COMPAT_VERSION) {
+    MMDSOp(MSG_MDS_INODEFILECAPS, HEAD_VERSION, COMPAT_VERSION) {
     this->ino = ino;
     this->caps = caps;
   }
diff --git a/src/messages/MLock.h b/src/messages/MLock.h
index e1ac38ba951c..dc3142d13d29 100644
--- a/src/messages/MLock.h
+++ b/src/messages/MLock.h
@@ -16,14 +16,14 @@
 #ifndef CEPH_MLOCK_H
 #define CEPH_MLOCK_H
 
-#include "msg/Message.h"
 #include "mds/locks.h"
 #include "mds/SimpleLock.h"
+#include "messages/MMDSOp.h"
 
-class MLock : public SafeMessage {
+class MLock : public MMDSOp {
 private:
-  static const int HEAD_VERSION = 1;
-  static const int COMPAT_VERSION = 1;
+  static constexpr int HEAD_VERSION = 1;
+  static constexpr int COMPAT_VERSION = 1;
 
   int32_t     action = 0;  // action type
   mds_rank_t  asker = 0;  // who is initiating this request
@@ -46,19 +46,19 @@ public:
   MDSCacheObjectInfo &get_object_info() { return object_info; }
 
 protected:
-  MLock() : SafeMessage{MSG_MDS_LOCK, HEAD_VERSION, COMPAT_VERSION} {}
+  MLock() : MMDSOp{MSG_MDS_LOCK, HEAD_VERSION, COMPAT_VERSION} {}
   MLock(int ac, mds_rank_t as) :
-    SafeMessage{MSG_MDS_LOCK, HEAD_VERSION, COMPAT_VERSION},
+    MMDSOp{MSG_MDS_LOCK, HEAD_VERSION, COMPAT_VERSION},
     action(ac), asker(as),
     lock_type(0) { }
   MLock(SimpleLock *lock, int ac, mds_rank_t as) :
-    SafeMessage{MSG_MDS_LOCK, HEAD_VERSION, COMPAT_VERSION},
+    MMDSOp{MSG_MDS_LOCK, HEAD_VERSION, COMPAT_VERSION},
     action(ac), asker(as),
     lock_type(lock->get_type()) {
     lock->get_parent()->set_object_info(object_info);
   }
   MLock(SimpleLock *lock, int ac, mds_rank_t as, ceph::buffer::list& bl) :
-    SafeMessage{MSG_MDS_LOCK, HEAD_VERSION, COMPAT_VERSION},
+    MMDSOp{MSG_MDS_LOCK, HEAD_VERSION, COMPAT_VERSION},
     action(ac), asker(as), lock_type(lock->get_type()) {
     lock->get_parent()->set_object_info(object_info);
     lockdata.claim(bl);
diff --git a/src/messages/MMDSCacheRejoin.h b/src/messages/MMDSCacheRejoin.h
index fba8faf3b71c..b0a87af1e3b0 100644
--- a/src/messages/MMDSCacheRejoin.h
+++ b/src/messages/MMDSCacheRejoin.h
@@ -16,18 +16,15 @@
 #define CEPH_MMDSCACHEREJOIN_H
 
 #include <string_view>
-
-#include "msg/Message.h"
-
 #include "include/types.h"
-
 #include "mds/CInode.h"
 #include "mds/CDir.h"
 #include "mds/mdstypes.h"
+#include "messages/MMDSOp.h"
 
 // sent from replica to auth
 
-class MMDSCacheRejoin : public SafeMessage {
+class MMDSCacheRejoin : public MMDSOp {
 public:
   static constexpr int OP_WEAK    = 1;  // replica -> auth, i exist, + maybe open files.
   static constexpr int OP_STRONG  = 2;  // replica -> auth, i exist, + open files and lock state.
@@ -348,7 +345,7 @@ private:
   static constexpr int COMPAT_VERSION = 1;
 
   MMDSCacheRejoin(int o) : MMDSCacheRejoin() { op = o; }
-  MMDSCacheRejoin() : SafeMessage{MSG_MDS_CACHEREJOIN, HEAD_VERSION, COMPAT_VERSION} {}
+  MMDSCacheRejoin() : MMDSOp{MSG_MDS_CACHEREJOIN, HEAD_VERSION, COMPAT_VERSION} {}
   ~MMDSCacheRejoin() override {}
 };
 
diff --git a/src/messages/MMDSFindIno.h b/src/messages/MMDSFindIno.h
index 6bc5e01204fa..a8845a62baa5 100644
--- a/src/messages/MMDSFindIno.h
+++ b/src/messages/MMDSFindIno.h
@@ -15,19 +15,19 @@
 #ifndef CEPH_MDSFINDINO_H
 #define CEPH_MDSFINDINO_H
 
-#include "msg/Message.h"
 #include "include/filepath.h"
+#include "messages/MMDSOp.h"
 
-class MMDSFindIno : public SafeMessage {
-  static const int HEAD_VERSION = 1;
-  static const int COMPAT_VERSION = 1;
+class MMDSFindIno : public MMDSOp {
+  static constexpr int HEAD_VERSION = 1;
+  static constexpr int COMPAT_VERSION = 1;
 public:
   ceph_tid_t tid {0};
   inodeno_t ino;
 
 protected:
-  MMDSFindIno() : SafeMessage{MSG_MDS_FINDINO, HEAD_VERSION, COMPAT_VERSION} {}
-  MMDSFindIno(ceph_tid_t t, inodeno_t i) : SafeMessage{MSG_MDS_FINDINO, HEAD_VERSION, COMPAT_VERSION}, tid(t), ino(i) {}
+  MMDSFindIno() : MMDSOp{MSG_MDS_FINDINO, HEAD_VERSION, COMPAT_VERSION} {}
+  MMDSFindIno(ceph_tid_t t, inodeno_t i) : MMDSOp{MSG_MDS_FINDINO, HEAD_VERSION, COMPAT_VERSION}, tid(t), ino(i) {}
   ~MMDSFindIno() override {}
 
 public:
diff --git a/src/messages/MMDSFindInoReply.h b/src/messages/MMDSFindInoReply.h
index 6747983ff4e1..c3807ac10454 100644
--- a/src/messages/MMDSFindInoReply.h
+++ b/src/messages/MMDSFindInoReply.h
@@ -15,19 +15,19 @@
 #ifndef CEPH_MDSFINDINOREPLY_H
 #define CEPH_MDSFINDINOREPLY_H
 
-#include "msg/Message.h"
 #include "include/filepath.h"
+#include "messages/MMDSOp.h"
 
-class MMDSFindInoReply : public SafeMessage {
-  static const int HEAD_VERSION = 1;
-  static const int COMPAT_VERSION = 1;
+class MMDSFindInoReply : public MMDSOp {
+  static constexpr int HEAD_VERSION = 1;
+  static constexpr int COMPAT_VERSION = 1;
 public:
   ceph_tid_t tid = 0;
   filepath path;
 
 protected:
-  MMDSFindInoReply() : SafeMessage{MSG_MDS_FINDINOREPLY, HEAD_VERSION, COMPAT_VERSION} {}
-  MMDSFindInoReply(ceph_tid_t t) : SafeMessage{MSG_MDS_FINDINOREPLY, HEAD_VERSION, COMPAT_VERSION}, tid(t) {}
+  MMDSFindInoReply() : MMDSOp{MSG_MDS_FINDINOREPLY, HEAD_VERSION, COMPAT_VERSION} {}
+  MMDSFindInoReply(ceph_tid_t t) : MMDSOp{MSG_MDS_FINDINOREPLY, HEAD_VERSION, COMPAT_VERSION}, tid(t) {}
   ~MMDSFindInoReply() override {}
 
 public:
diff --git a/src/messages/MMDSFragmentNotify.h b/src/messages/MMDSFragmentNotify.h
index cd5e2369895c..65d21d40c7cc 100644
--- a/src/messages/MMDSFragmentNotify.h
+++ b/src/messages/MMDSFragmentNotify.h
@@ -15,9 +15,9 @@
 #ifndef CEPH_MMDSFRAGMENTNOTIFY_H
 #define CEPH_MMDSFRAGMENTNOTIFY_H
 
-#include "msg/Message.h"
+#include "messages/MMDSOp.h"
 
-class MMDSFragmentNotify : public SafeMessage {
+class MMDSFragmentNotify : public MMDSOp {
 private:
   static constexpr int HEAD_VERSION = 2;
   static constexpr int COMPAT_VERSION = 1;
@@ -38,9 +38,9 @@ private:
 
 protected:
   MMDSFragmentNotify() :
-    SafeMessage{MSG_MDS_FRAGMENTNOTIFY, HEAD_VERSION, COMPAT_VERSION} {}
+    MMDSOp{MSG_MDS_FRAGMENTNOTIFY, HEAD_VERSION, COMPAT_VERSION} {}
   MMDSFragmentNotify(dirfrag_t df, int b, uint64_t tid) :
-    SafeMessage{MSG_MDS_FRAGMENTNOTIFY, HEAD_VERSION, COMPAT_VERSION},
+    MMDSOp{MSG_MDS_FRAGMENTNOTIFY, HEAD_VERSION, COMPAT_VERSION},
     base_dirfrag(df), bits(b) {
     set_tid(tid);
   }
diff --git a/src/messages/MMDSFragmentNotifyAck.h b/src/messages/MMDSFragmentNotifyAck.h
index 197f965a014f..ed976c3dd9ff 100644
--- a/src/messages/MMDSFragmentNotifyAck.h
+++ b/src/messages/MMDSFragmentNotifyAck.h
@@ -15,9 +15,9 @@
 #ifndef CEPH_MMDSFRAGMENTNOTIFYAck_H
 #define CEPH_MMDSFRAGMENTNOTIFYAck_H
 
-#include "msg/Message.h"
+#include "messages/MMDSOp.h"
 
-class MMDSFragmentNotifyAck : public SafeMessage {
+class MMDSFragmentNotifyAck : public MMDSOp {
 private:
   dirfrag_t base_dirfrag;
   int8_t bits = 0;
@@ -29,9 +29,9 @@ private:
   ceph::buffer::list basebl;
 
 protected:
-  MMDSFragmentNotifyAck() : SafeMessage{MSG_MDS_FRAGMENTNOTIFYACK} {}
+  MMDSFragmentNotifyAck() : MMDSOp{MSG_MDS_FRAGMENTNOTIFYACK} {}
   MMDSFragmentNotifyAck(dirfrag_t df, int b, uint64_t tid) :
-    SafeMessage{MSG_MDS_FRAGMENTNOTIFYACK},
+    MMDSOp{MSG_MDS_FRAGMENTNOTIFYACK},
     base_dirfrag(df), bits(b) {
     set_tid(tid);
   }
diff --git a/src/messages/MMDSOpenIno.h b/src/messages/MMDSOpenIno.h
index e49a27429dda..e08dd683a5df 100644
--- a/src/messages/MMDSOpenIno.h
+++ b/src/messages/MMDSOpenIno.h
@@ -15,19 +15,19 @@
 #ifndef CEPH_MDSOPENINO_H
 #define CEPH_MDSOPENINO_H
 
-#include "msg/Message.h"
+#include "messages/MMDSOp.h"
 
-class MMDSOpenIno : public SafeMessage {
-  static const int HEAD_VERSION = 1;
-  static const int COMPAT_VERSION = 1;
+class MMDSOpenIno : public MMDSOp {
+  static constexpr int HEAD_VERSION = 1;
+  static constexpr int COMPAT_VERSION = 1;
 public:
   inodeno_t ino;
   std::vector<inode_backpointer_t> ancestors;
 
 protected:
-  MMDSOpenIno() : SafeMessage{MSG_MDS_OPENINO, HEAD_VERSION, COMPAT_VERSION} {}
+  MMDSOpenIno() : MMDSOp{MSG_MDS_OPENINO, HEAD_VERSION, COMPAT_VERSION} {}
   MMDSOpenIno(ceph_tid_t t, inodeno_t i, std::vector<inode_backpointer_t>* pa) :
-    SafeMessage{MSG_MDS_OPENINO, HEAD_VERSION, COMPAT_VERSION}, ino(i) {
+    MMDSOp{MSG_MDS_OPENINO, HEAD_VERSION, COMPAT_VERSION}, ino(i) {
     header.tid = t;
     if (pa)
       ancestors = *pa;
diff --git a/src/messages/MMDSOpenInoReply.h b/src/messages/MMDSOpenInoReply.h
index 5821260d3482..a65bbade3f89 100644
--- a/src/messages/MMDSOpenInoReply.h
+++ b/src/messages/MMDSOpenInoReply.h
@@ -15,21 +15,21 @@
 #ifndef CEPH_MDSOPENINOREPLY_H
 #define CEPH_MDSOPENINOREPLY_H
 
-#include "msg/Message.h"
+#include "messages/MMDSOp.h"
 
-class MMDSOpenInoReply : public SafeMessage {
+class MMDSOpenInoReply : public MMDSOp {
 public:
-  static const int HEAD_VERSION = 1;
-  static const int COMPAT_VERSION = 1;
+  static constexpr int HEAD_VERSION = 1;
+  static constexpr int COMPAT_VERSION = 1;
   inodeno_t ino;
   std::vector<inode_backpointer_t> ancestors;
   mds_rank_t hint;
   int32_t error;
 
 protected:
-  MMDSOpenInoReply() : SafeMessage{MSG_MDS_OPENINOREPLY, HEAD_VERSION, COMPAT_VERSION}, error(0) {}
+  MMDSOpenInoReply() : MMDSOp{MSG_MDS_OPENINOREPLY, HEAD_VERSION, COMPAT_VERSION}, error(0) {}
   MMDSOpenInoReply(ceph_tid_t t, inodeno_t i, mds_rank_t h=MDS_RANK_NONE, int e=0) :
-    SafeMessage{MSG_MDS_OPENINOREPLY, HEAD_VERSION, COMPAT_VERSION}, ino(i), hint(h), error(e) {
+    MMDSOp{MSG_MDS_OPENINOREPLY, HEAD_VERSION, COMPAT_VERSION}, ino(i), hint(h), error(e) {
     header.tid = t;
   }
 
diff --git a/src/messages/MMDSResolve.h b/src/messages/MMDSResolve.h
index c303b241a7a9..22add6d02c5a 100644
--- a/src/messages/MMDSResolve.h
+++ b/src/messages/MMDSResolve.h
@@ -15,15 +15,13 @@
 #ifndef CEPH_MMDSRESOLVE_H
 #define CEPH_MMDSRESOLVE_H
 
-#include "msg/Message.h"
-
 #include "include/types.h"
-
 #include "mds/Capability.h"
+#include "messages/MMDSOp.h"
 
-class MMDSResolve : public SafeMessage {
-  static const int HEAD_VERSION = 1;
-  static const int COMPAT_VERSION = 1;
+class MMDSResolve : public MMDSOp {
+  static constexpr int HEAD_VERSION = 1;
+  static constexpr int COMPAT_VERSION = 1;
 
 public:
   std::map<dirfrag_t, std::vector<dirfrag_t>> subtrees;
@@ -96,7 +94,7 @@ public:
   std::list<table_client> table_clients;
 
 protected:
-  MMDSResolve() : SafeMessage{MSG_MDS_RESOLVE, HEAD_VERSION, COMPAT_VERSION}
+  MMDSResolve() : MMDSOp{MSG_MDS_RESOLVE, HEAD_VERSION, COMPAT_VERSION}
  {}
   ~MMDSResolve() override {}
 
diff --git a/src/messages/MMDSResolveAck.h b/src/messages/MMDSResolveAck.h
index 5e1e49077095..de92d30f8bc0 100644
--- a/src/messages/MMDSResolveAck.h
+++ b/src/messages/MMDSResolveAck.h
@@ -15,20 +15,19 @@
 #ifndef CEPH_MMDSRESOLVEACK_H
 #define CEPH_MMDSRESOLVEACK_H
 
-#include "msg/Message.h"
-
 #include "include/types.h"
+#include "messages/MMDSOp.h"
 
 
-class MMDSResolveAck : public SafeMessage {
-  static const int HEAD_VERSION = 1;
-  static const int COMPAT_VERSION = 1;
+class MMDSResolveAck : public MMDSOp {
+  static constexpr int HEAD_VERSION = 1;
+  static constexpr int COMPAT_VERSION = 1;
 public:
   std::map<metareqid_t, ceph::buffer::list> commit;
   std::vector<metareqid_t> abort;
 
 protected:
-  MMDSResolveAck() : SafeMessage{MSG_MDS_RESOLVEACK, HEAD_VERSION, COMPAT_VERSION} {}
+  MMDSResolveAck() : MMDSOp{MSG_MDS_RESOLVEACK, HEAD_VERSION, COMPAT_VERSION} {}
   ~MMDSResolveAck() override {}
 
 public:
diff --git a/src/messages/MMDSSlaveRequest.h b/src/messages/MMDSSlaveRequest.h
index e1aa30aea773..4c1f2a6c287c 100644
--- a/src/messages/MMDSSlaveRequest.h
+++ b/src/messages/MMDSSlaveRequest.h
@@ -16,10 +16,10 @@
 #ifndef CEPH_MMDSSLAVEREQUEST_H
 #define CEPH_MMDSSLAVEREQUEST_H
 
-#include "msg/Message.h"
 #include "mds/mdstypes.h"
+#include "messages/MMDSOp.h"
 
-class MMDSSlaveRequest : public SafeMessage {
+class MMDSSlaveRequest : public MMDSOp {
   static constexpr int HEAD_VERSION = 1;
   static constexpr int COMPAT_VERSION = 1;
 public:
@@ -165,9 +165,9 @@ public:
   ceph::buffer::list& get_lock_data() { return inode_export; }
 
 protected:
-  MMDSSlaveRequest() : SafeMessage{MSG_MDS_SLAVE_REQUEST, HEAD_VERSION, COMPAT_VERSION} { }
+  MMDSSlaveRequest() : MMDSOp{MSG_MDS_SLAVE_REQUEST, HEAD_VERSION, COMPAT_VERSION} { }
   MMDSSlaveRequest(metareqid_t ri, __u32 att, int o) : 
-    SafeMessage{MSG_MDS_SLAVE_REQUEST, HEAD_VERSION, COMPAT_VERSION},
+    MMDSOp{MSG_MDS_SLAVE_REQUEST, HEAD_VERSION, COMPAT_VERSION},
     reqid(ri), attempt(att), op(o), flags(0), lock_type(0),
     inode_export_v(0), srcdn_auth(MDS_RANK_NONE) { }
   ~MMDSSlaveRequest() override {}
diff --git a/src/messages/MMDSSnapUpdate.h b/src/messages/MMDSSnapUpdate.h
index 2fed73a34af6..45349b42c194 100644
--- a/src/messages/MMDSSnapUpdate.h
+++ b/src/messages/MMDSSnapUpdate.h
@@ -15,9 +15,9 @@
 #ifndef CEPH_MMDSSNAPUPDATE_H
 #define CEPH_MMDSSNAPUPDATE_H
 
-#include "msg/Message.h"
+#include "messages/MMDSOp.h"
 
-class MMDSSnapUpdate : public SafeMessage {
+class MMDSSnapUpdate : public MMDSOp {
 private:
   inodeno_t ino;
   __s16 snap_op;
@@ -29,9 +29,9 @@ public:
   ceph::buffer::list snap_blob;
 
 protected:
-  MMDSSnapUpdate() : SafeMessage{MSG_MDS_SNAPUPDATE} {}
+  MMDSSnapUpdate() : MMDSOp{MSG_MDS_SNAPUPDATE} {}
   MMDSSnapUpdate(inodeno_t i, version_t tid, int op) :
-    SafeMessage{MSG_MDS_SNAPUPDATE}, ino(i), snap_op(op) {
+    MMDSOp{MSG_MDS_SNAPUPDATE}, ino(i), snap_op(op) {
       set_tid(tid);
     }
   ~MMDSSnapUpdate() override {}
diff --git a/src/messages/MMDSTableRequest.h b/src/messages/MMDSTableRequest.h
index 8c1689509612..5bef687b9a15 100644
--- a/src/messages/MMDSTableRequest.h
+++ b/src/messages/MMDSTableRequest.h
@@ -16,10 +16,10 @@
 #ifndef CEPH_MMDSTABLEREQUEST_H
 #define CEPH_MMDSTABLEREQUEST_H
 
-#include "msg/Message.h"
 #include "mds/mds_table_types.h"
+#include "messages/MMDSOp.h"
 
-class MMDSTableRequest : public SafeMessage {
+class MMDSTableRequest : public MMDSOp {
 public:
   __u16 table = 0;
   __s16 op = 0;
@@ -27,9 +27,9 @@ public:
   ceph::buffer::list bl;
 
 protected:
-  MMDSTableRequest() : SafeMessage{MSG_MDS_TABLE_REQUEST} {}
+  MMDSTableRequest() : MMDSOp{MSG_MDS_TABLE_REQUEST} {}
   MMDSTableRequest(int tab, int o, uint64_t r, version_t v=0) : 
-    SafeMessage{MSG_MDS_TABLE_REQUEST},
+    MMDSOp{MSG_MDS_TABLE_REQUEST},
     table(tab), op(o), reqid(r) {
     set_tid(v);
   }