message: mark message classes "final"

silences warnings like:

src/messages/MOSDPGUpdateLogMissingReply.h:74:34: warning: class with destructor marked 'final' cannot be inherited from [-Wfinal-dtor-non-final-class]
  ~MOSDPGUpdateLogMissingReply() final {}
                                 ^
../src/messages/MOSDPGUpdateLogMissingReply.h:21:7: note: mark 'MOSDPGUpdateLogMissingReply' as 'final' to silence this warning
class MOSDPGUpdateLogMissingReply : public MOSDFastDispatchOp {
      ^
1 warning generated.

Signed-off-by: Kefu Chai <kchai@redhat.com>

137 files changed, 137 insertions, 137 deletions

diff --git a/src/messages/MAuth.h b/src/messages/MAuth.h
index a505d177e3d..8e066a3cf51 100644
--- a/src/messages/MAuth.h
+++ b/src/messages/MAuth.h
@@ -23,7 +23,7 @@
 #include "msg/MessageRef.h"
 #include "messages/PaxosServiceMessage.h"
 
-class MAuth : public PaxosServiceMessage {
+class MAuth final : public PaxosServiceMessage {
 public:
   __u32 protocol;
   ceph::buffer::list auth_payload;
diff --git a/src/messages/MAuthReply.h b/src/messages/MAuthReply.h
index 3b4824e5116..1c7c5e506a0 100644
--- a/src/messages/MAuthReply.h
+++ b/src/messages/MAuthReply.h
@@ -18,7 +18,7 @@
 #include "msg/Message.h"
 #include "common/errno.h"
 
-class MAuthReply : public Message {
+class MAuthReply final : public Message {
 public:
   __u32 protocol;
   errorcode32_t result;
diff --git a/src/messages/MCacheExpire.h b/src/messages/MCacheExpire.h
index 536fd8f8ee2..1c9334ba047 100644
--- a/src/messages/MCacheExpire.h
+++ b/src/messages/MCacheExpire.h
@@ -19,7 +19,7 @@
 #include "mds/mdstypes.h"
 #include "messages/MMDSOp.h"
 
-class MCacheExpire : public MMDSOp {
+class MCacheExpire final : public MMDSOp {
 private:
   __s32 from;
 
diff --git a/src/messages/MClientCapRelease.h b/src/messages/MClientCapRelease.h
index d8a5945de2e..1524dd25cc8 100644
--- a/src/messages/MClientCapRelease.h
+++ b/src/messages/MClientCapRelease.h
@@ -18,7 +18,7 @@
 #include "msg/Message.h"
 
 
-class MClientCapRelease : public SafeMessage {
+class MClientCapRelease final : public SafeMessage {
  public:
   std::string_view get_type_name() const override { return "client_cap_release";}
   void print(std::ostream& out) const override {
diff --git a/src/messages/MClientCaps.h b/src/messages/MClientCaps.h
index 34dc9ef9bf3..afde190bf33 100644
--- a/src/messages/MClientCaps.h
+++ b/src/messages/MClientCaps.h
@@ -19,7 +19,7 @@
 #include "mds/mdstypes.h"
 #include "include/ceph_features.h"
 
-class MClientCaps : public SafeMessage {
+class MClientCaps final : public SafeMessage {
 private:
 
   static constexpr int HEAD_VERSION = 11;
diff --git a/src/messages/MClientLease.h b/src/messages/MClientLease.h
index 4c69f169314..cad0f3f2155 100644
--- a/src/messages/MClientLease.h
+++ b/src/messages/MClientLease.h
@@ -20,7 +20,7 @@
 
 #include "msg/Message.h"
 
-class MClientLease : public SafeMessage {
+class MClientLease final : public SafeMessage {
 public:
   struct ceph_mds_lease h;
   std::string dname;
diff --git a/src/messages/MClientMetrics.h b/src/messages/MClientMetrics.h
index e243aca7cf3..5e4234c69bb 100644
--- a/src/messages/MClientMetrics.h
+++ b/src/messages/MClientMetrics.h
@@ -9,7 +9,7 @@
 #include "msg/Message.h"
 #include "include/cephfs/metrics/Types.h"
 
-class MClientMetrics : public SafeMessage {
+class MClientMetrics final : public SafeMessage {
 private:
   static constexpr int HEAD_VERSION = 1;
   static constexpr int COMPAT_VERSION = 1;
diff --git a/src/messages/MClientQuota.h b/src/messages/MClientQuota.h
index 48cceb506e6..4dad9f1d00e 100644
--- a/src/messages/MClientQuota.h
+++ b/src/messages/MClientQuota.h
@@ -3,7 +3,7 @@
 
 #include "msg/Message.h"
 
-class MClientQuota : public SafeMessage {
+class MClientQuota final : public SafeMessage {
 public:
   inodeno_t ino;
   nest_info_t rstat;
diff --git a/src/messages/MClientReclaim.h b/src/messages/MClientReclaim.h
index f4033d40f56..f3f0ff09edc 100644
--- a/src/messages/MClientReclaim.h
+++ b/src/messages/MClientReclaim.h
@@ -18,7 +18,7 @@
 
 #include "msg/Message.h"
 
-class MClientReclaim: public SafeMessage {
+class MClientReclaim final : public SafeMessage {
 public:
   static constexpr int HEAD_VERSION = 1;
   static constexpr int COMPAT_VERSION = 1;
diff --git a/src/messages/MClientReclaimReply.h b/src/messages/MClientReclaimReply.h
index 918c7b6e980..354906cd4d2 100644
--- a/src/messages/MClientReclaimReply.h
+++ b/src/messages/MClientReclaimReply.h
@@ -18,7 +18,7 @@
 
 #include "msg/Message.h"
 
-class MClientReclaimReply: public SafeMessage {
+class MClientReclaimReply final : public SafeMessage {
 public:
   static constexpr int HEAD_VERSION = 1;
   static constexpr int COMPAT_VERSION = 1;
diff --git a/src/messages/MClientReconnect.h b/src/messages/MClientReconnect.h
index 23e1fd25d76..43c5a407687 100644
--- a/src/messages/MClientReconnect.h
+++ b/src/messages/MClientReconnect.h
@@ -20,7 +20,7 @@
 #include "include/ceph_features.h"
 
 
-class MClientReconnect : public SafeMessage {
+class MClientReconnect final : public SafeMessage {
 private:
   static constexpr int HEAD_VERSION = 5;
   static constexpr int COMPAT_VERSION = 4;
diff --git a/src/messages/MClientReply.h b/src/messages/MClientReply.h
index 1f57f9098e7..92ccccb86db 100644
--- a/src/messages/MClientReply.h
+++ b/src/messages/MClientReply.h
@@ -287,7 +287,7 @@ public:
 } __attribute__ ((__may_alias__));
 WRITE_CLASS_ENCODER(openc_response_t)
 
-class MClientReply : public SafeMessage {
+class MClientReply final : public SafeMessage {
 public:
   // reply data
   struct ceph_mds_reply_head head {};
diff --git a/src/messages/MClientRequest.h b/src/messages/MClientRequest.h
index 444d182363d..a1abb8688af 100644
--- a/src/messages/MClientRequest.h
+++ b/src/messages/MClientRequest.h
@@ -48,7 +48,7 @@
 
 // metadata ops.
 
-class MClientRequest : public MMDSOp {
+class MClientRequest final : public MMDSOp {
 private:
   static constexpr int HEAD_VERSION = 4;
   static constexpr int COMPAT_VERSION = 1;
diff --git a/src/messages/MClientRequestForward.h b/src/messages/MClientRequestForward.h
index 3c176a81482..5c1eebd4b15 100644
--- a/src/messages/MClientRequestForward.h
+++ b/src/messages/MClientRequestForward.h
@@ -18,7 +18,7 @@
 
 #include "msg/Message.h"
 
-class MClientRequestForward : public SafeMessage {
+class MClientRequestForward final : public SafeMessage {
 private:
   int32_t dest_mds;
   int32_t num_fwd;
diff --git a/src/messages/MClientSession.h b/src/messages/MClientSession.h
index fa2cb1ddb27..19dc30f256a 100644
--- a/src/messages/MClientSession.h
+++ b/src/messages/MClientSession.h
@@ -18,7 +18,7 @@
 #include "msg/Message.h"
 #include "mds/mdstypes.h"
 
-class MClientSession : public SafeMessage {
+class MClientSession final : public SafeMessage {
 private:
   static constexpr int HEAD_VERSION = 4;
   static constexpr int COMPAT_VERSION = 1;
diff --git a/src/messages/MClientSnap.h b/src/messages/MClientSnap.h
index 47f8b6e2a4c..75178bffad1 100644
--- a/src/messages/MClientSnap.h
+++ b/src/messages/MClientSnap.h
@@ -17,7 +17,7 @@
 
 #include "msg/Message.h"
 
-class MClientSnap : public SafeMessage {
+class MClientSnap final : public SafeMessage {
 public:
   ceph_mds_snap_head head;
   ceph::buffer::list bl;
diff --git a/src/messages/MCommand.h b/src/messages/MCommand.h
index 5680fbb8283..cd912cd2853 100644
--- a/src/messages/MCommand.h
+++ b/src/messages/MCommand.h
@@ -19,7 +19,7 @@
 
 #include "msg/Message.h"
 
-class MCommand : public Message {
+class MCommand final : public Message {
 public:
   uuid_d fsid;
   std::vector<std::string> cmd;
diff --git a/src/messages/MCommandReply.h b/src/messages/MCommandReply.h
index 81b0f55f6b7..ed627c85cab 100644
--- a/src/messages/MCommandReply.h
+++ b/src/messages/MCommandReply.h
@@ -20,7 +20,7 @@
 #include "msg/Message.h"
 #include "MCommand.h"
 
-class MCommandReply : public Message {
+class MCommandReply final : public Message {
 public:
   errorcode32_t r;
   std::string rs;
diff --git a/src/messages/MDentryLink.h b/src/messages/MDentryLink.h
index 6dfff460222..c461105bcf4 100644
--- a/src/messages/MDentryLink.h
+++ b/src/messages/MDentryLink.h
@@ -20,7 +20,7 @@
 
 #include "messages/MMDSOp.h"
 
-class MDentryLink : public MMDSOp {
+class MDentryLink final : public MMDSOp {
 private:
   static constexpr int HEAD_VERSION = 1;
   static constexpr int COMPAT_VERSION = 1;
diff --git a/src/messages/MDentryUnlink.h b/src/messages/MDentryUnlink.h
index a790603385a..02edb92fb30 100644
--- a/src/messages/MDentryUnlink.h
+++ b/src/messages/MDentryUnlink.h
@@ -20,7 +20,7 @@
 
 #include "messages/MMDSOp.h"
 
-class MDentryUnlink : public MMDSOp {
+class MDentryUnlink final : public MMDSOp {
 private:
   static constexpr int HEAD_VERSION = 1;
   static constexpr int COMPAT_VERSION = 1;
diff --git a/src/messages/MDirUpdate.h b/src/messages/MDirUpdate.h
index 658e2899c31..47ea3a7f44a 100644
--- a/src/messages/MDirUpdate.h
+++ b/src/messages/MDirUpdate.h
@@ -18,7 +18,7 @@
 
 #include "messages/MMDSOp.h"
 
-class MDirUpdate : public MMDSOp {
+class MDirUpdate final : public MMDSOp {
 public:
   mds_rank_t get_source_mds() const { return from_mds; }
   dirfrag_t get_dirfrag() const { return dirfrag; }
diff --git a/src/messages/MDiscover.h b/src/messages/MDiscover.h
index f51155bf06a..7b69981b4df 100644
--- a/src/messages/MDiscover.h
+++ b/src/messages/MDiscover.h
@@ -22,7 +22,7 @@
 #include <string>
 
 
-class MDiscover : public MMDSOp {
+class MDiscover final : public MMDSOp {
 private:
   static constexpr int HEAD_VERSION = 1;
   static constexpr int COMPAT_VERSION = 1;
diff --git a/src/messages/MDiscoverReply.h b/src/messages/MDiscoverReply.h
index 6db772efd10..e2d11d0fb7a 100644
--- a/src/messages/MDiscoverReply.h
+++ b/src/messages/MDiscoverReply.h
@@ -63,7 +63,7 @@
  * 
  */
 
-class MDiscoverReply : public MMDSOp {
+class MDiscoverReply final : public MMDSOp {
 private:
   static constexpr int HEAD_VERSION = 2;
   static constexpr int COMPAT_VERSION = 2;
diff --git a/src/messages/MExportCaps.h b/src/messages/MExportCaps.h
index ff96549696e..63cf927e889 100644
--- a/src/messages/MExportCaps.h
+++ b/src/messages/MExportCaps.h
@@ -18,7 +18,7 @@
 
 #include "messages/MMDSOp.h"
 
-class MExportCaps : public MMDSOp {
+class MExportCaps final : public MMDSOp {
 private:
   static constexpr int HEAD_VERSION = 2;
   static constexpr int COMPAT_VERSION = 1;
diff --git a/src/messages/MExportCapsAck.h b/src/messages/MExportCapsAck.h
index b56206cfd58..1ac62fdd4f5 100644
--- a/src/messages/MExportCapsAck.h
+++ b/src/messages/MExportCapsAck.h
@@ -18,7 +18,7 @@
 
 #include "messages/MMDSOp.h"
 
-class MExportCapsAck : public MMDSOp {
+class MExportCapsAck final : public MMDSOp {
  static constexpr int HEAD_VERSION = 1;
  static constexpr int COMPAT_VERSION = 1;
 
diff --git a/src/messages/MExportDir.h b/src/messages/MExportDir.h
index ff6f8dd35e8..882aecfca30 100644
--- a/src/messages/MExportDir.h
+++ b/src/messages/MExportDir.h
@@ -18,7 +18,7 @@
 
 #include "messages/MMDSOp.h"
 
-class MExportDir : public MMDSOp {
+class MExportDir final : public MMDSOp {
 public:
   dirfrag_t dirfrag;
   ceph::buffer::list export_data;
diff --git a/src/messages/MExportDirAck.h b/src/messages/MExportDirAck.h
index 32ee8a8a7f8..4728cc3ab86 100644
--- a/src/messages/MExportDirAck.h
+++ b/src/messages/MExportDirAck.h
@@ -18,7 +18,7 @@
 #include "MExportDir.h"
 #include "messages/MMDSOp.h"
 
-class MExportDirAck : public MMDSOp {
+class MExportDirAck final : public MMDSOp {
 public:
   dirfrag_t dirfrag;
   ceph::buffer::list imported_caps;
diff --git a/src/messages/MExportDirCancel.h b/src/messages/MExportDirCancel.h
index 060515aec1e..50bba26792c 100644
--- a/src/messages/MExportDirCancel.h
+++ b/src/messages/MExportDirCancel.h
@@ -18,7 +18,7 @@
 #include "include/types.h"
 #include "messages/MMDSOp.h"
 
-class MExportDirCancel : public MMDSOp {
+class MExportDirCancel final : public MMDSOp {
 private:
   static constexpr int HEAD_VERSION = 1;
   static constexpr int COMPAT_VERSION = 1;
diff --git a/src/messages/MExportDirDiscover.h b/src/messages/MExportDirDiscover.h
index 328b7ab2329..91d62a49b78 100644
--- a/src/messages/MExportDirDiscover.h
+++ b/src/messages/MExportDirDiscover.h
@@ -18,7 +18,7 @@
 #include "include/types.h"
 #include "messages/MMDSOp.h"
 
-class MExportDirDiscover : public MMDSOp {
+class MExportDirDiscover final : public MMDSOp {
 private:
   static constexpr int HEAD_VERSION = 1;
   static constexpr int COMPAT_VERSION = 1;
diff --git a/src/messages/MExportDirDiscoverAck.h b/src/messages/MExportDirDiscoverAck.h
index b20ce206ecc..b33ed07a576 100644
--- a/src/messages/MExportDirDiscoverAck.h
+++ b/src/messages/MExportDirDiscoverAck.h
@@ -18,7 +18,7 @@
 #include "include/types.h"
 #include "messages/MMDSOp.h"
 
-class MExportDirDiscoverAck : public MMDSOp {
+class MExportDirDiscoverAck final : public MMDSOp {
 private:
   static constexpr int HEAD_VERSION = 1;
   static constexpr int COMPAT_VERSION = 1;
diff --git a/src/messages/MExportDirFinish.h b/src/messages/MExportDirFinish.h
index 1e5212e82ca..5cbf9ae292c 100644
--- a/src/messages/MExportDirFinish.h
+++ b/src/messages/MExportDirFinish.h
@@ -17,7 +17,7 @@
 
 #include "messages/MMDSOp.h"
 
-class MExportDirFinish : public MMDSOp {
+class MExportDirFinish final : public MMDSOp {
 private:
   static constexpr int HEAD_VERSION = 1;
   static constexpr int COMPAT_VERSION = 1;
diff --git a/src/messages/MExportDirNotify.h b/src/messages/MExportDirNotify.h
index 6ee41dbcbf7..bad8f82a09c 100644
--- a/src/messages/MExportDirNotify.h
+++ b/src/messages/MExportDirNotify.h
@@ -17,7 +17,7 @@
 
 #include "messages/MMDSOp.h"
 
-class MExportDirNotify : public MMDSOp {
+class MExportDirNotify final : public MMDSOp {
 private:
   static constexpr int HEAD_VERSION = 1;
   static constexpr int COMPAT_VERSION = 1;
diff --git a/src/messages/MExportDirNotifyAck.h b/src/messages/MExportDirNotifyAck.h
index f6994374e10..71ffafc145d 100644
--- a/src/messages/MExportDirNotifyAck.h
+++ b/src/messages/MExportDirNotifyAck.h
@@ -17,7 +17,7 @@
 
 #include "messages/MMDSOp.h"
 
-class MExportDirNotifyAck : public MMDSOp {
+class MExportDirNotifyAck final : public MMDSOp {
 private:
   static constexpr int HEAD_VERSION = 1;
   static constexpr int COMPAT_VERSION = 1;
diff --git a/src/messages/MExportDirPrep.h b/src/messages/MExportDirPrep.h
index c4f3ff3a4c0..4a456d517bc 100644
--- a/src/messages/MExportDirPrep.h
+++ b/src/messages/MExportDirPrep.h
@@ -19,7 +19,7 @@
 #include "include/types.h"
 #include "messages/MMDSOp.h"
 
-class MExportDirPrep : public MMDSOp {
+class MExportDirPrep final : public MMDSOp {
 private:
   static constexpr int HEAD_VERSION = 1;
   static constexpr int COMPAT_VERSION = 1;
diff --git a/src/messages/MExportDirPrepAck.h b/src/messages/MExportDirPrepAck.h
index a4db2aa859f..1d5456ac8fb 100644
--- a/src/messages/MExportDirPrepAck.h
+++ b/src/messages/MExportDirPrepAck.h
@@ -18,7 +18,7 @@
 #include "include/types.h"
 #include "messages/MMDSOp.h"
 
-class MExportDirPrepAck : public MMDSOp {
+class MExportDirPrepAck final : public MMDSOp {
 private:
   static constexpr int HEAD_VERSION = 1;
   static constexpr int COMPAT_VERSION = 1;
diff --git a/src/messages/MFSMap.h b/src/messages/MFSMap.h
index 740fe633412..fff7529d371 100644
--- a/src/messages/MFSMap.h
+++ b/src/messages/MFSMap.h
@@ -20,7 +20,7 @@
 #include "mds/FSMap.h"
 #include "include/ceph_features.h"
 
-class MFSMap : public Message {
+class MFSMap final : public Message {
 public:
   epoch_t epoch;
 
diff --git a/src/messages/MFSMapUser.h b/src/messages/MFSMapUser.h
index 82f1ab7d217..2d41928414d 100644
--- a/src/messages/MFSMapUser.h
+++ b/src/messages/MFSMapUser.h
@@ -19,7 +19,7 @@
 #include "mds/FSMapUser.h"
 #include "include/ceph_features.h"
 
-class MFSMapUser : public Message {
+class MFSMapUser final : public Message {
 public:
   epoch_t epoch;
 
diff --git a/src/messages/MForward.h b/src/messages/MForward.h
index b6c02890481..f47de8fc2fa 100644
--- a/src/messages/MForward.h
+++ b/src/messages/MForward.h
@@ -24,7 +24,7 @@
 #include "include/encoding.h"
 #include "include/stringify.h"
 
-class MForward : public Message {
+class MForward final : public Message {
 public:
   uint64_t tid;
   uint8_t client_type;
diff --git a/src/messages/MGatherCaps.h b/src/messages/MGatherCaps.h
index febc600b750..f3f05b94e57 100644
--- a/src/messages/MGatherCaps.h
+++ b/src/messages/MGatherCaps.h
@@ -4,7 +4,7 @@
 #include "messages/MMDSOp.h"
 
 
-class MGatherCaps : public MMDSOp {
+class MGatherCaps final : public MMDSOp {
   static constexpr int HEAD_VERSION = 1;
   static constexpr int COMPAT_VERSION = 1;
 
diff --git a/src/messages/MGetPoolStats.h b/src/messages/MGetPoolStats.h
index 92f71a67fa6..82d1fcd2d63 100644
--- a/src/messages/MGetPoolStats.h
+++ b/src/messages/MGetPoolStats.h
@@ -18,7 +18,7 @@
 
 #include "messages/PaxosServiceMessage.h"
 
-class MGetPoolStats : public PaxosServiceMessage {
+class MGetPoolStats final : public PaxosServiceMessage {
 public:
   uuid_d fsid;
   std::vector<std::string> pools;
diff --git a/src/messages/MGetPoolStatsReply.h b/src/messages/MGetPoolStatsReply.h
index bfdfca88897..eaf95d4a0f5 100644
--- a/src/messages/MGetPoolStatsReply.h
+++ b/src/messages/MGetPoolStatsReply.h
@@ -16,7 +16,7 @@
 #ifndef CEPH_MGETPOOLSTATSREPLY_H
 #define CEPH_MGETPOOLSTATSREPLY_H
 
-class MGetPoolStatsReply : public PaxosServiceMessage {
+class MGetPoolStatsReply final : public PaxosServiceMessage {
   static constexpr int HEAD_VERSION = 2;
   static constexpr int COMPAT_VERSION = 1;
 
diff --git a/src/messages/MHeartbeat.h b/src/messages/MHeartbeat.h
index 6b9be69a121..40c1042b6a8 100644
--- a/src/messages/MHeartbeat.h
+++ b/src/messages/MHeartbeat.h
@@ -20,7 +20,7 @@
 #include "common/DecayCounter.h"
 #include "messages/MMDSOp.h"
 
-class MHeartbeat : public MMDSOp {
+class MHeartbeat final : public MMDSOp {
 private:
   mds_load_t load;
   __s32 beat = 0;
diff --git a/src/messages/MInodeFileCaps.h b/src/messages/MInodeFileCaps.h
index 247ce534501..e2a189ec42c 100644
--- a/src/messages/MInodeFileCaps.h
+++ b/src/messages/MInodeFileCaps.h
@@ -18,7 +18,7 @@
 
 #include "messages/MMDSOp.h"
 
-class MInodeFileCaps : public MMDSOp {
+class MInodeFileCaps final : public MMDSOp {
 private:
   static constexpr int HEAD_VERSION = 1;
   static constexpr int COMPAT_VERSION = 1;
diff --git a/src/messages/MLock.h b/src/messages/MLock.h
index 5c7a966d0ff..25dd718f83a 100644
--- a/src/messages/MLock.h
+++ b/src/messages/MLock.h
@@ -20,7 +20,7 @@
 #include "mds/SimpleLock.h"
 #include "messages/MMDSOp.h"
 
-class MLock : public MMDSOp {
+class MLock final : public MMDSOp {
 private:
   static constexpr int HEAD_VERSION = 1;
   static constexpr int COMPAT_VERSION = 1;
diff --git a/src/messages/MLog.h b/src/messages/MLog.h
index 1471a87fca7..e38aab904b7 100644
--- a/src/messages/MLog.h
+++ b/src/messages/MLog.h
@@ -20,7 +20,7 @@
 
 #include <deque>
 
-class MLog : public PaxosServiceMessage {
+class MLog final : public PaxosServiceMessage {
 public:
   uuid_d fsid;
   std::deque<LogEntry> entries;
diff --git a/src/messages/MLogAck.h b/src/messages/MLogAck.h
index 73caf455788..5949157e260 100644
--- a/src/messages/MLogAck.h
+++ b/src/messages/MLogAck.h
@@ -23,7 +23,7 @@
 
 #include "msg/Message.h"
 
-class MLogAck : public Message {
+class MLogAck final : public Message {
 public:
   uuid_d fsid;
   version_t last = 0;
diff --git a/src/messages/MMDSBeacon.h b/src/messages/MMDSBeacon.h
index 6554f41381d..068cc02e103 100644
--- a/src/messages/MMDSBeacon.h
+++ b/src/messages/MMDSBeacon.h
@@ -183,7 +183,7 @@ struct MDSHealth
 WRITE_CLASS_ENCODER(MDSHealth)
 
 
-class MMDSBeacon : public PaxosServiceMessage {
+class MMDSBeacon final : public PaxosServiceMessage {
 private:
 
   static constexpr int HEAD_VERSION = 8;
diff --git a/src/messages/MMDSCacheRejoin.h b/src/messages/MMDSCacheRejoin.h
index ec60d842d39..7bd40999949 100644
--- a/src/messages/MMDSCacheRejoin.h
+++ b/src/messages/MMDSCacheRejoin.h
@@ -24,7 +24,7 @@
 
 // sent from replica to auth
 
-class MMDSCacheRejoin : public MMDSOp {
+class MMDSCacheRejoin final : 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.
diff --git a/src/messages/MMDSFindIno.h b/src/messages/MMDSFindIno.h
index a632c15cebc..09f8e72ffc6 100644
--- a/src/messages/MMDSFindIno.h
+++ b/src/messages/MMDSFindIno.h
@@ -18,7 +18,7 @@
 #include "include/filepath.h"
 #include "messages/MMDSOp.h"
 
-class MMDSFindIno : public MMDSOp {
+class MMDSFindIno final : public MMDSOp {
   static constexpr int HEAD_VERSION = 1;
   static constexpr int COMPAT_VERSION = 1;
 public:
diff --git a/src/messages/MMDSFindInoReply.h b/src/messages/MMDSFindInoReply.h
index eccef13877d..eef8e692627 100644
--- a/src/messages/MMDSFindInoReply.h
+++ b/src/messages/MMDSFindInoReply.h
@@ -18,7 +18,7 @@
 #include "include/filepath.h"
 #include "messages/MMDSOp.h"
 
-class MMDSFindInoReply : public MMDSOp {
+class MMDSFindInoReply final : public MMDSOp {
   static constexpr int HEAD_VERSION = 1;
   static constexpr int COMPAT_VERSION = 1;
 public:
diff --git a/src/messages/MMDSFragmentNotify.h b/src/messages/MMDSFragmentNotify.h
index 0ab4a6ea7ac..7ae5829f9e0 100644
--- a/src/messages/MMDSFragmentNotify.h
+++ b/src/messages/MMDSFragmentNotify.h
@@ -17,7 +17,7 @@
 
 #include "messages/MMDSOp.h"
 
-class MMDSFragmentNotify : public MMDSOp {
+class MMDSFragmentNotify final : public MMDSOp {
 private:
   static constexpr int HEAD_VERSION = 2;
   static constexpr int COMPAT_VERSION = 1;
diff --git a/src/messages/MMDSFragmentNotifyAck.h b/src/messages/MMDSFragmentNotifyAck.h
index b154fb1f581..4d60a732ebe 100644
--- a/src/messages/MMDSFragmentNotifyAck.h
+++ b/src/messages/MMDSFragmentNotifyAck.h
@@ -17,7 +17,7 @@
 
 #include "messages/MMDSOp.h"
 
-class MMDSFragmentNotifyAck : public MMDSOp {
+class MMDSFragmentNotifyAck final : public MMDSOp {
 private:
   dirfrag_t base_dirfrag;
   int8_t bits = 0;
diff --git a/src/messages/MMDSLoadTargets.h b/src/messages/MMDSLoadTargets.h
index 91966b03daf..bab923db03f 100644
--- a/src/messages/MMDSLoadTargets.h
+++ b/src/messages/MMDSLoadTargets.h
@@ -23,7 +23,7 @@
 #include <map>
 using std::map;
 
-class MMDSLoadTargets : public PaxosServiceMessage {
+class MMDSLoadTargets final : public PaxosServiceMessage {
 public:
   mds_gid_t global_id;
   std::set<mds_rank_t> targets;
diff --git a/src/messages/MMDSMap.h b/src/messages/MMDSMap.h
index f92be56191b..c3bf2bc5a12 100644
--- a/src/messages/MMDSMap.h
+++ b/src/messages/MMDSMap.h
@@ -20,7 +20,7 @@
 #include "mds/MDSMap.h"
 #include "include/ceph_features.h"
 
-class MMDSMap : public SafeMessage {
+class MMDSMap final : public SafeMessage {
 private:
   static constexpr int HEAD_VERSION = 2;
   static constexpr int COMPAT_VERSION = 1;
diff --git a/src/messages/MMDSMetrics.h b/src/messages/MMDSMetrics.h
index 218604799a3..1cb74188017 100644
--- a/src/messages/MMDSMetrics.h
+++ b/src/messages/MMDSMetrics.h
@@ -7,7 +7,7 @@
 #include "messages/MMDSOp.h"
 #include "mds/MDSPerfMetricTypes.h"
 
-class MMDSMetrics : public MMDSOp {
+class MMDSMetrics final : public MMDSOp {
 private:
   static constexpr int HEAD_VERSION = 1;
   static constexpr int COMPAT_VERSION = 1;
diff --git a/src/messages/MMDSOp.h b/src/messages/MMDSOp.h
index 4dc6edb3c5e..53a67ea85fc 100644
--- a/src/messages/MMDSOp.h
+++ b/src/messages/MMDSOp.h
@@ -7,7 +7,7 @@
  * messages in MDSRankDispatcher are versioned. Therefore
  * all MDS-MDS messages must be of type MMDSOp.
  */
-class MMDSOp: public SafeMessage {
+class MMDSOp : public SafeMessage {
 public:
   template<typename... Types>
   MMDSOp(Types&&... args)
diff --git a/src/messages/MMDSOpenIno.h b/src/messages/MMDSOpenIno.h
index 32a89bf5f63..b51795338ef 100644
--- a/src/messages/MMDSOpenIno.h
+++ b/src/messages/MMDSOpenIno.h
@@ -17,7 +17,7 @@
 
 #include "messages/MMDSOp.h"
 
-class MMDSOpenIno : public MMDSOp {
+class MMDSOpenIno final : public MMDSOp {
   static constexpr int HEAD_VERSION = 1;
   static constexpr int COMPAT_VERSION = 1;
 public:
diff --git a/src/messages/MMDSOpenInoReply.h b/src/messages/MMDSOpenInoReply.h
index a65bbade3f8..a331b5f8b40 100644
--- a/src/messages/MMDSOpenInoReply.h
+++ b/src/messages/MMDSOpenInoReply.h
@@ -17,7 +17,7 @@
 
 #include "messages/MMDSOp.h"
 
-class MMDSOpenInoReply : public MMDSOp {
+class MMDSOpenInoReply final : public MMDSOp {
 public:
   static constexpr int HEAD_VERSION = 1;
   static constexpr int COMPAT_VERSION = 1;
diff --git a/src/messages/MMDSPeerRequest.h b/src/messages/MMDSPeerRequest.h
index afdec1ee1ee..68861211cf1 100644
--- a/src/messages/MMDSPeerRequest.h
+++ b/src/messages/MMDSPeerRequest.h
@@ -19,7 +19,7 @@
 #include "mds/mdstypes.h"
 #include "messages/MMDSOp.h"
 
-class MMDSPeerRequest : public MMDSOp {
+class MMDSPeerRequest final : public MMDSOp {
   static constexpr int HEAD_VERSION = 1;
   static constexpr int COMPAT_VERSION = 1;
 public:
diff --git a/src/messages/MMDSPing.h b/src/messages/MMDSPing.h
index 2ed0fe808d2..6c1f2f20ede 100644
--- a/src/messages/MMDSPing.h
+++ b/src/messages/MMDSPing.h
@@ -7,7 +7,7 @@
 #include "include/types.h"
 #include "messages/MMDSOp.h"
 
-class MMDSPing : public MMDSOp {
+class MMDSPing final : public MMDSOp {
 private:
   static constexpr int HEAD_VERSION = 1;
   static constexpr int COMPAT_VERSION = 1;
diff --git a/src/messages/MMDSResolve.h b/src/messages/MMDSResolve.h
index 5e1757a335a..d636bdcd559 100644
--- a/src/messages/MMDSResolve.h
+++ b/src/messages/MMDSResolve.h
@@ -19,7 +19,7 @@
 #include "mds/Capability.h"
 #include "messages/MMDSOp.h"
 
-class MMDSResolve : public MMDSOp {
+class MMDSResolve final : public MMDSOp {
   static constexpr int HEAD_VERSION = 1;
   static constexpr int COMPAT_VERSION = 1;
 
diff --git a/src/messages/MMDSResolveAck.h b/src/messages/MMDSResolveAck.h
index afa9d5d0be5..727f83f450c 100644
--- a/src/messages/MMDSResolveAck.h
+++ b/src/messages/MMDSResolveAck.h
@@ -19,7 +19,7 @@
 #include "messages/MMDSOp.h"
 
 
-class MMDSResolveAck : public MMDSOp {
+class MMDSResolveAck final : public MMDSOp {
   static constexpr int HEAD_VERSION = 1;
   static constexpr int COMPAT_VERSION = 1;
 public:
diff --git a/src/messages/MMDSSnapUpdate.h b/src/messages/MMDSSnapUpdate.h
index 10c64f37fc2..51b9760247e 100644
--- a/src/messages/MMDSSnapUpdate.h
+++ b/src/messages/MMDSSnapUpdate.h
@@ -17,7 +17,7 @@
 
 #include "messages/MMDSOp.h"
 
-class MMDSSnapUpdate : public MMDSOp {
+class MMDSSnapUpdate final : public MMDSOp {
 private:
   inodeno_t ino;
   __s16 snap_op;
diff --git a/src/messages/MMDSTableRequest.h b/src/messages/MMDSTableRequest.h
index 2705ae686fa..365d5fb59fb 100644
--- a/src/messages/MMDSTableRequest.h
+++ b/src/messages/MMDSTableRequest.h
@@ -19,7 +19,7 @@
 #include "mds/mds_table_types.h"
 #include "messages/MMDSOp.h"
 
-class MMDSTableRequest : public MMDSOp {
+class MMDSTableRequest final : public MMDSOp {
 public:
   __u16 table = 0;
   __s16 op = 0;
diff --git a/src/messages/MMgrBeacon.h b/src/messages/MMgrBeacon.h
index 9d7c238058c..5b6ca3b60be 100644
--- a/src/messages/MMgrBeacon.h
+++ b/src/messages/MMgrBeacon.h
@@ -22,7 +22,7 @@
 #include "include/types.h"
 
 
-class MMgrBeacon : public PaxosServiceMessage {
+class MMgrBeacon final : public PaxosServiceMessage {
 private:
   static constexpr int HEAD_VERSION = 10;
   static constexpr int COMPAT_VERSION = 8;
diff --git a/src/messages/MMgrCommand.h b/src/messages/MMgrCommand.h
index 0dc8077f70a..83ee618c508 100644
--- a/src/messages/MMgrCommand.h
+++ b/src/messages/MMgrCommand.h
@@ -7,7 +7,7 @@
 
 #include "msg/Message.h"
 
-class MMgrCommand : public Message {
+class MMgrCommand final : public Message {
 public:
   uuid_d fsid;
   std::vector<std::string> cmd;
diff --git a/src/messages/MMgrCommandReply.h b/src/messages/MMgrCommandReply.h
index e372efbb692..40b8fd34d77 100644
--- a/src/messages/MMgrCommandReply.h
+++ b/src/messages/MMgrCommandReply.h
@@ -8,7 +8,7 @@
 #include "msg/Message.h"
 #include "MMgrCommand.h"
 
-class MMgrCommandReply : public Message {
+class MMgrCommandReply final : public Message {
 public:
   errorcode32_t r;
   std::string rs;
diff --git a/src/messages/MMgrDigest.h b/src/messages/MMgrDigest.h
index e9cddceea5c..69f3368683a 100644
--- a/src/messages/MMgrDigest.h
+++ b/src/messages/MMgrDigest.h
@@ -22,7 +22,7 @@
  * The mgr digest is a way for the mgr to subscribe to things
  * other than the cluster maps, which are needed by 
  */
-class MMgrDigest : public Message {
+class MMgrDigest final : public Message {
 public:
   ceph::buffer::list mon_status_json;
   ceph::buffer::list health_json;
diff --git a/src/messages/MMgrMap.h b/src/messages/MMgrMap.h
index 26c712f636d..9f16130bebd 100644
--- a/src/messages/MMgrMap.h
+++ b/src/messages/MMgrMap.h
@@ -19,7 +19,7 @@
 #include "msg/Message.h"
 #include "mon/MgrMap.h"
 
-class MMgrMap : public Message {
+class MMgrMap final : public Message {
 protected:
   MgrMap map;
 
diff --git a/src/messages/MMonCommand.h b/src/messages/MMonCommand.h
index ece3fa8a441..fbba9629fb6 100644
--- a/src/messages/MMonCommand.h
+++ b/src/messages/MMonCommand.h
@@ -20,7 +20,7 @@
 #include <vector>
 #include <string>
 
-class MMonCommand : public PaxosServiceMessage {
+class MMonCommand final : public PaxosServiceMessage {
 public:
   // weird note: prior to octopus, MgrClient would leave fsid blank when
   // sending commands to the mgr.  Starting with octopus, this is either
diff --git a/src/messages/MMonCommandAck.h b/src/messages/MMonCommandAck.h
index 52d95c78f2d..96cf61fdaf8 100644
--- a/src/messages/MMonCommandAck.h
+++ b/src/messages/MMonCommandAck.h
@@ -17,7 +17,7 @@
 
 #include "messages/PaxosServiceMessage.h"
 
-class MMonCommandAck : public PaxosServiceMessage {
+class MMonCommandAck final : public PaxosServiceMessage {
 public:
   std::vector<std::string> cmd;
   errorcode32_t r;
diff --git a/src/messages/MMonElection.h b/src/messages/MMonElection.h
index de9c47f9761..d50a5c0ffe0 100644
--- a/src/messages/MMonElection.h
+++ b/src/messages/MMonElection.h
@@ -21,7 +21,7 @@
 #include "mon/MonMap.h"
 #include "mon/mon_types.h"
 
-class MMonElection : public Message {
+class MMonElection final : public Message {
 private:
   static constexpr int HEAD_VERSION = 9;
   static constexpr int COMPAT_VERSION = 5;
diff --git a/src/messages/MMonGetMap.h b/src/messages/MMonGetMap.h
index 49ebe225878..9192da077f8 100644
--- a/src/messages/MMonGetMap.h
+++ b/src/messages/MMonGetMap.h
@@ -19,7 +19,7 @@
 
 #include "include/types.h"
 
-class MMonGetMap : public Message {
+class MMonGetMap final : public Message {
 public:
   MMonGetMap() : Message{CEPH_MSG_MON_GET_MAP} { }
 private:
diff --git a/src/messages/MMonGetOSDMap.h b/src/messages/MMonGetOSDMap.h
index fadf3ed90bc..c70938b7ea8 100644
--- a/src/messages/MMonGetOSDMap.h
+++ b/src/messages/MMonGetOSDMap.h
@@ -23,7 +23,7 @@
 
 #include "include/types.h"
 
-class MMonGetOSDMap : public PaxosServiceMessage {
+class MMonGetOSDMap final : public PaxosServiceMessage {
 private:
   epoch_t full_first, full_last;
   epoch_t inc_first, inc_last;
diff --git a/src/messages/MMonGetPurgedSnaps.h b/src/messages/MMonGetPurgedSnaps.h
index b2e8fcbc950..9b1977e37d1 100644
--- a/src/messages/MMonGetPurgedSnaps.h
+++ b/src/messages/MMonGetPurgedSnaps.h
@@ -6,7 +6,7 @@
 #include "PaxosServiceMessage.h"
 #include "include/types.h"
 
-class MMonGetPurgedSnaps : public PaxosServiceMessage {
+class MMonGetPurgedSnaps final : public PaxosServiceMessage {
 public:
   epoch_t start, last;
 
diff --git a/src/messages/MMonGetPurgedSnapsReply.h b/src/messages/MMonGetPurgedSnapsReply.h
index 73da094992a..7810ab6d720 100644
--- a/src/messages/MMonGetPurgedSnapsReply.h
+++ b/src/messages/MMonGetPurgedSnapsReply.h
@@ -7,7 +7,7 @@
 #include "osd/osd_types.h"
 #include "include/types.h"
 
-class MMonGetPurgedSnapsReply : public PaxosServiceMessage {
+class MMonGetPurgedSnapsReply final : public PaxosServiceMessage {
 public:
   epoch_t start, last;
   std::map<epoch_t,mempool::osdmap::map<int64_t,snap_interval_set_t>> purged_snaps;
diff --git a/src/messages/MMonGetVersion.h b/src/messages/MMonGetVersion.h
index 9bb2c2e6aca..ad91cd15574 100644
--- a/src/messages/MMonGetVersion.h
+++ b/src/messages/MMonGetVersion.h
@@ -25,7 +25,7 @@
  * can be used to determine whether a pool actually does not exist, or
  * if it may have been created but the map was not received yet.
  */
-class MMonGetVersion : public Message {
+class MMonGetVersion final : public Message {
 public:
   MMonGetVersion() : Message{CEPH_MSG_MON_GET_VERSION} {}
 
diff --git a/src/messages/MMonGetVersionReply.h b/src/messages/MMonGetVersionReply.h
index dba861b3aaf..407b449a065 100644
--- a/src/messages/MMonGetVersionReply.h
+++ b/src/messages/MMonGetVersionReply.h
@@ -24,7 +24,7 @@
  * MMonGetVersion. The latest version of the requested thing is sent
  * back.
  */
-class MMonGetVersionReply : public Message {
+class MMonGetVersionReply final : public Message {
 private:
   static constexpr int HEAD_VERSION = 2;
 
diff --git a/src/messages/MMonGlobalID.h b/src/messages/MMonGlobalID.h
index 7cc5de61390..4330974e025 100644
--- a/src/messages/MMonGlobalID.h
+++ b/src/messages/MMonGlobalID.h
@@ -17,7 +17,7 @@
 
 #include "messages/PaxosServiceMessage.h"
 
-class MMonGlobalID : public PaxosServiceMessage {
+class MMonGlobalID final : public PaxosServiceMessage {
 public:
   uint64_t old_max_id = 0;
   MMonGlobalID() : PaxosServiceMessage{MSG_MON_GLOBAL_ID, 0}
diff --git a/src/messages/MMonHealth.h b/src/messages/MMonHealth.h
index 2d0a3fae3ea..9f5d4084ccb 100644
--- a/src/messages/MMonHealth.h
+++ b/src/messages/MMonHealth.h
@@ -18,7 +18,7 @@
 #include "messages/MMonQuorumService.h"
 #include "mon/mon_types.h"
 
-class MMonHealth : public MMonQuorumService {
+class MMonHealth final : public MMonQuorumService {
 public:
   static constexpr int HEAD_VERSION = 1;
 
diff --git a/src/messages/MMonHealthChecks.h b/src/messages/MMonHealthChecks.h
index 8c3c130488e..9dd726fd4e3 100644
--- a/src/messages/MMonHealthChecks.h
+++ b/src/messages/MMonHealthChecks.h
@@ -7,7 +7,7 @@
 #include "messages/PaxosServiceMessage.h"
 #include "mon/health_check.h"
 
-class MMonHealthChecks : public PaxosServiceMessage {
+class MMonHealthChecks final : public PaxosServiceMessage {
 public:
   static constexpr int HEAD_VERSION = 1;
   static constexpr int COMPAT_VERSION = 1;
diff --git a/src/messages/MMonJoin.h b/src/messages/MMonJoin.h
index e8517330358..309035e5b0b 100644
--- a/src/messages/MMonJoin.h
+++ b/src/messages/MMonJoin.h
@@ -17,7 +17,7 @@
 
 #include "messages/PaxosServiceMessage.h"
 
-class MMonJoin : public PaxosServiceMessage {
+class MMonJoin final : public PaxosServiceMessage {
 public:
   static constexpr int HEAD_VERSION = 2;
   static constexpr int COMPAT_VERSION = 2;
diff --git a/src/messages/MMonMap.h b/src/messages/MMonMap.h
index 390a6e0916d..e72c115f6f8 100644
--- a/src/messages/MMonMap.h
+++ b/src/messages/MMonMap.h
@@ -21,7 +21,7 @@
 #include "msg/MessageRef.h"
 #include "mon/MonMap.h"
 
-class MMonMap : public Message {
+class MMonMap final : public Message {
 public:
   ceph::buffer::list monmapbl;
 
diff --git a/src/messages/MMonMgrReport.h b/src/messages/MMonMgrReport.h
index 1b4038ee871..0ca37a8ef9d 100644
--- a/src/messages/MMonMgrReport.h
+++ b/src/messages/MMonMgrReport.h
@@ -21,7 +21,7 @@
 #include "mon/health_check.h"
 #include "mon/PGMap.h"
 
-class MMonMgrReport : public PaxosServiceMessage {
+class MMonMgrReport final : public PaxosServiceMessage {
 private:
   static constexpr int HEAD_VERSION = 2;
   static constexpr int COMPAT_VERSION = 1;
diff --git a/src/messages/MMonPaxos.h b/src/messages/MMonPaxos.h
index f4817da14da..e1aabc64c4e 100644
--- a/src/messages/MMonPaxos.h
+++ b/src/messages/MMonPaxos.h
@@ -20,7 +20,7 @@
 #include "mon/mon_types.h"
 #include "include/ceph_features.h"
 
-class MMonPaxos : public Message {
+class MMonPaxos final : public Message {
 private:
   static constexpr int HEAD_VERSION = 4;
   static constexpr int COMPAT_VERSION = 3;
diff --git a/src/messages/MMonPing.h b/src/messages/MMonPing.h
index ed511f50be6..682094958b4 100644
--- a/src/messages/MMonPing.h
+++ b/src/messages/MMonPing.h
@@ -18,7 +18,7 @@
 #include "msg/Message.h"
 #include "mon/ConnectionTracker.h"
 
-class MMonPing : public Message {
+class MMonPing final : public Message {
 private:
   static constexpr int HEAD_VERSION = 1;
   static constexpr int COMPAT_VERSION = 1;
diff --git a/src/messages/MMonProbe.h b/src/messages/MMonProbe.h
index 11e32984048..bb5012300cf 100644
--- a/src/messages/MMonProbe.h
+++ b/src/messages/MMonProbe.h
@@ -21,7 +21,7 @@
 #include "msg/Message.h"
 #include "mon/MonMap.h"
 
-class MMonProbe : public Message {
+class MMonProbe final : public Message {
 public:
   static constexpr int HEAD_VERSION = 7;
   static constexpr int COMPAT_VERSION = 5;
diff --git a/src/messages/MMonSubscribe.h b/src/messages/MMonSubscribe.h
index df692afe30a..55220b0cee3 100644
--- a/src/messages/MMonSubscribe.h
+++ b/src/messages/MMonSubscribe.h
@@ -29,7 +29,7 @@ struct ceph_mon_subscribe_item_old {
 WRITE_RAW_ENCODER(ceph_mon_subscribe_item_old)
 
 
-class MMonSubscribe : public Message {
+class MMonSubscribe final : public Message {
 public:
   static constexpr int HEAD_VERSION = 3;
   static constexpr int COMPAT_VERSION = 1;
diff --git a/src/messages/MMonSubscribeAck.h b/src/messages/MMonSubscribeAck.h
index 3fd2c8f32bf..2f6e2eddb8d 100644
--- a/src/messages/MMonSubscribeAck.h
+++ b/src/messages/MMonSubscribeAck.h
@@ -17,7 +17,7 @@
 
 #include "msg/Message.h"
 
-class MMonSubscribeAck : public Message {
+class MMonSubscribeAck final : public Message {
 public:
   __u32 interval;
   uuid_d fsid;
diff --git a/src/messages/MOSDAlive.h b/src/messages/MOSDAlive.h
index e53ae0102d6..f43e9e2665b 100644
--- a/src/messages/MOSDAlive.h
+++ b/src/messages/MOSDAlive.h
@@ -19,7 +19,7 @@
 
 #include "messages/PaxosServiceMessage.h"
 
-class MOSDAlive : public PaxosServiceMessage {
+class MOSDAlive final : public PaxosServiceMessage {
 public:
   epoch_t want = 0;
 
diff --git a/src/messages/MOSDBoot.h b/src/messages/MOSDBoot.h
index dae78e31621..d40324f4ac1 100644
--- a/src/messages/MOSDBoot.h
+++ b/src/messages/MOSDBoot.h
@@ -21,7 +21,7 @@
 #include "include/types.h"
 #include "osd/osd_types.h"
 
-class MOSDBoot : public PaxosServiceMessage {
+class MOSDBoot final : public PaxosServiceMessage {
 private:
   static constexpr int HEAD_VERSION = 7;
   static constexpr int COMPAT_VERSION = 7;
diff --git a/src/messages/MOSDFailure.h b/src/messages/MOSDFailure.h
index 7639f88f4ba..72aa644ed66 100644
--- a/src/messages/MOSDFailure.h
+++ b/src/messages/MOSDFailure.h
@@ -19,7 +19,7 @@
 #include "messages/PaxosServiceMessage.h"
 
 
-class MOSDFailure : public PaxosServiceMessage {
+class MOSDFailure final : public PaxosServiceMessage {
 private:
   static constexpr int HEAD_VERSION = 4;
   static constexpr int COMPAT_VERSION = 4;
diff --git a/src/messages/MOSDForceRecovery.h b/src/messages/MOSDForceRecovery.h
index e6de9f9ff67..2d9ccc0e01a 100644
--- a/src/messages/MOSDForceRecovery.h
+++ b/src/messages/MOSDForceRecovery.h
@@ -31,7 +31,7 @@ static const int OFR_BACKFILL = 2;
 // cancel priority boost, requeue if necessary
 static const int OFR_CANCEL = 4;
 
-class MOSDForceRecovery : public Message {
+class MOSDForceRecovery final : public Message {
 public:
   static constexpr int HEAD_VERSION = 2;
   static constexpr int COMPAT_VERSION = 2;
diff --git a/src/messages/MOSDFull.h b/src/messages/MOSDFull.h
index 008b0e31b08..89f5b84024f 100644
--- a/src/messages/MOSDFull.h
+++ b/src/messages/MOSDFull.h
@@ -11,7 +11,7 @@
 // future this message could be generalized to other state bits, but
 // for now name it for its sole application.
 
-class MOSDFull : public PaxosServiceMessage {
+class MOSDFull final : public PaxosServiceMessage {
 public:
   epoch_t map_epoch = 0;
   uint32_t state = 0;
diff --git a/src/messages/MOSDMap.h b/src/messages/MOSDMap.h
index 33ebb86804e..4a57011c44f 100644
--- a/src/messages/MOSDMap.h
+++ b/src/messages/MOSDMap.h
@@ -20,7 +20,7 @@
 #include "osd/OSDMap.h"
 #include "include/ceph_features.h"
 
-class MOSDMap : public Message {
+class MOSDMap final : public Message {
 private:
   static constexpr int HEAD_VERSION = 4;
   static constexpr int COMPAT_VERSION = 3;
diff --git a/src/messages/MOSDMarkMeDead.h b/src/messages/MOSDMarkMeDead.h
index 00203ae7391..35f98805564 100644
--- a/src/messages/MOSDMarkMeDead.h
+++ b/src/messages/MOSDMarkMeDead.h
@@ -5,7 +5,7 @@
 
 #include "messages/PaxosServiceMessage.h"
 
-class MOSDMarkMeDead : public PaxosServiceMessage {
+class MOSDMarkMeDead final : public PaxosServiceMessage {
 private:
   static constexpr int HEAD_VERSION = 1;
   static constexpr int COMPAT_VERSION = 1;
diff --git a/src/messages/MOSDMarkMeDown.h b/src/messages/MOSDMarkMeDown.h
index 7a2c9406f09..2ff0e1cd809 100644
--- a/src/messages/MOSDMarkMeDown.h
+++ b/src/messages/MOSDMarkMeDown.h
@@ -17,7 +17,7 @@
 
 #include "messages/PaxosServiceMessage.h"
 
-class MOSDMarkMeDown : public PaxosServiceMessage {
+class MOSDMarkMeDown final : public PaxosServiceMessage {
 private:
   static constexpr int HEAD_VERSION = 3;
   static constexpr int COMPAT_VERSION = 3;
diff --git a/src/messages/MOSDOp.h b/src/messages/MOSDOp.h
index df89baf3842..2275c458832 100644
--- a/src/messages/MOSDOp.h
+++ b/src/messages/MOSDOp.h
@@ -34,7 +34,7 @@ class MOSDOpReply;
 
 namespace _mosdop {
 template<typename V>
-class MOSDOp : public MOSDFastDispatchOp {
+class MOSDOp final : public MOSDFastDispatchOp {
 private:
   static constexpr int HEAD_VERSION = 8;
   static constexpr int COMPAT_VERSION = 3;
diff --git a/src/messages/MOSDOpReply.h b/src/messages/MOSDOpReply.h
index 01bc0f85ca0..54c5157c221 100644
--- a/src/messages/MOSDOpReply.h
+++ b/src/messages/MOSDOpReply.h
@@ -29,7 +29,7 @@
  *
  */
 
-class MOSDOpReply : public Message {
+class MOSDOpReply final : public Message {
 private:
   static constexpr int HEAD_VERSION = 8;
   static constexpr int COMPAT_VERSION = 2;
diff --git a/src/messages/MOSDPGBackfill.h b/src/messages/MOSDPGBackfill.h
index 97f16ab229a..eccb4e69630 100644
--- a/src/messages/MOSDPGBackfill.h
+++ b/src/messages/MOSDPGBackfill.h
@@ -17,7 +17,7 @@
 
 #include "MOSDFastDispatchOp.h"
 
-class MOSDPGBackfill : public MOSDFastDispatchOp {
+class MOSDPGBackfill final : public MOSDFastDispatchOp {
 private:
   static constexpr int HEAD_VERSION = 3;
   static constexpr int COMPAT_VERSION = 3;
diff --git a/src/messages/MOSDPGBackfillRemove.h b/src/messages/MOSDPGBackfillRemove.h
index f75b52b072f..6029024ee7c 100644
--- a/src/messages/MOSDPGBackfillRemove.h
+++ b/src/messages/MOSDPGBackfillRemove.h
@@ -21,7 +21,7 @@
  * instruct non-primary to remove some objects during backfill
  */
 
-class MOSDPGBackfillRemove : public MOSDFastDispatchOp {
+class MOSDPGBackfillRemove final : public MOSDFastDispatchOp {
 public:
   static constexpr int HEAD_VERSION = 1;
   static constexpr int COMPAT_VERSION = 1;
diff --git a/src/messages/MOSDPGCreate.h b/src/messages/MOSDPGCreate.h
index d234e5096d3..405135ed8fe 100644
--- a/src/messages/MOSDPGCreate.h
+++ b/src/messages/MOSDPGCreate.h
@@ -23,7 +23,7 @@
  * PGCreate - instruct an OSD to create a pg, if it doesn't already exist
  */
 
-class MOSDPGCreate : public Message {
+class MOSDPGCreate final : public Message {
 public:
   static constexpr int HEAD_VERSION = 3;
   static constexpr int COMPAT_VERSION = 3;
diff --git a/src/messages/MOSDPGCreate2.h b/src/messages/MOSDPGCreate2.h
index 7f0f7ddaea6..d05387c7bcb 100644
--- a/src/messages/MOSDPGCreate2.h
+++ b/src/messages/MOSDPGCreate2.h
@@ -10,7 +10,7 @@
  * PGCreate2 - instruct an OSD to create some pgs
  */
 
-class MOSDPGCreate2 : public Message {
+class MOSDPGCreate2 final : public Message {
 public:
   static constexpr int HEAD_VERSION = 2;
   static constexpr int COMPAT_VERSION = 1;
diff --git a/src/messages/MOSDPGInfo.h b/src/messages/MOSDPGInfo.h
index eb0e9b6f8fa..b742cd014d7 100644
--- a/src/messages/MOSDPGInfo.h
+++ b/src/messages/MOSDPGInfo.h
@@ -19,7 +19,7 @@
 #include "msg/Message.h"
 #include "osd/osd_types.h"
 
-class MOSDPGInfo : public Message {
+class MOSDPGInfo final : public Message {
 private:
   static constexpr int HEAD_VERSION = 6;
   static constexpr int COMPAT_VERSION = 5;
diff --git a/src/messages/MOSDPGInfo2.h b/src/messages/MOSDPGInfo2.h
index 8dbe8bcf5dc..8e7f4bc5852 100644
--- a/src/messages/MOSDPGInfo2.h
+++ b/src/messages/MOSDPGInfo2.h
@@ -6,7 +6,7 @@
 #include "messages/MOSDPeeringOp.h"
 #include "osd/PGPeeringEvent.h"
 
-class MOSDPGInfo2 : public MOSDPeeringOp {
+class MOSDPGInfo2 final : public MOSDPeeringOp {
 private:
   static constexpr int HEAD_VERSION = 1;
   static constexpr int COMPAT_VERSION = 1;
diff --git a/src/messages/MOSDPGLease.h b/src/messages/MOSDPGLease.h
index 46c2b4a3aea..20b197e1d28 100644
--- a/src/messages/MOSDPGLease.h
+++ b/src/messages/MOSDPGLease.h
@@ -6,7 +6,7 @@
 #include "msg/Message.h"
 #include "osd/osd_types.h"
 
-class MOSDPGLease : public MOSDPeeringOp {
+class MOSDPGLease final : public MOSDPeeringOp {
 private:
   static constexpr int HEAD_VERSION = 1;
   static constexpr int COMPAT_VERSION = 1;
diff --git a/src/messages/MOSDPGLeaseAck.h b/src/messages/MOSDPGLeaseAck.h
index 9cc72bb72be..5c6c1188a4c 100644
--- a/src/messages/MOSDPGLeaseAck.h
+++ b/src/messages/MOSDPGLeaseAck.h
@@ -6,7 +6,7 @@
 #include "msg/Message.h"
 #include "osd/osd_types.h"
 
-class MOSDPGLeaseAck : public MOSDPeeringOp {
+class MOSDPGLeaseAck final : public MOSDPeeringOp {
 private:
   static constexpr int HEAD_VERSION = 1;
   static constexpr int COMPAT_VERSION = 1;
diff --git a/src/messages/MOSDPGLog.h b/src/messages/MOSDPGLog.h
index 2731f4249b4..fc3b9174d48 100644
--- a/src/messages/MOSDPGLog.h
+++ b/src/messages/MOSDPGLog.h
@@ -19,7 +19,7 @@
 #include "messages/MOSDPeeringOp.h"
 #include "osd/PGPeeringEvent.h"
 
-class MOSDPGLog : public MOSDPeeringOp {
+class MOSDPGLog final : public MOSDPeeringOp {
 private:
   static constexpr int HEAD_VERSION = 6;
   static constexpr int COMPAT_VERSION = 5;
diff --git a/src/messages/MOSDPGNotify.h b/src/messages/MOSDPGNotify.h
index 1f820fb41af..a3b237c1a8b 100644
--- a/src/messages/MOSDPGNotify.h
+++ b/src/messages/MOSDPGNotify.h
@@ -23,7 +23,7 @@
  * PGNotify - notify primary of my PGs and versions.
  */
 
-class MOSDPGNotify : public Message {
+class MOSDPGNotify final : public Message {
 private:
   static constexpr int HEAD_VERSION = 7;
   static constexpr int COMPAT_VERSION = 6;
diff --git a/src/messages/MOSDPGNotify2.h b/src/messages/MOSDPGNotify2.h
index d74902cc6cf..12703739855 100644
--- a/src/messages/MOSDPGNotify2.h
+++ b/src/messages/MOSDPGNotify2.h
@@ -6,7 +6,7 @@
 #include "messages/MOSDPeeringOp.h"
 #include "osd/PGPeeringEvent.h"
 
-class MOSDPGNotify2 : public MOSDPeeringOp {
+class MOSDPGNotify2 final : public MOSDPeeringOp {
 private:
   static constexpr int HEAD_VERSION = 1;
   static constexpr int COMPAT_VERSION = 1;
diff --git a/src/messages/MOSDPGQuery.h b/src/messages/MOSDPGQuery.h
index 2430dd47123..b9a48b98976 100644
--- a/src/messages/MOSDPGQuery.h
+++ b/src/messages/MOSDPGQuery.h
@@ -23,7 +23,7 @@
  * PGQuery - query another OSD as to the contents of their PGs
  */
 
-class MOSDPGQuery : public Message {
+class MOSDPGQuery final : public Message {
 private:
   static constexpr int HEAD_VERSION = 4;
   static constexpr int COMPAT_VERSION = 4;
diff --git a/src/messages/MOSDPGQuery2.h b/src/messages/MOSDPGQuery2.h
index d1ff3ba1647..d2257ee536f 100644
--- a/src/messages/MOSDPGQuery2.h
+++ b/src/messages/MOSDPGQuery2.h
@@ -6,7 +6,7 @@
 #include "messages/MOSDPeeringOp.h"
 #include "osd/PGPeeringEvent.h"
 
-class MOSDPGQuery2 : public MOSDPeeringOp {
+class MOSDPGQuery2 final : public MOSDPeeringOp {
 private:
   static constexpr int HEAD_VERSION = 1;
   static constexpr int COMPAT_VERSION = 1;
diff --git a/src/messages/MOSDPGRecoveryDelete.h b/src/messages/MOSDPGRecoveryDelete.h
index 437b65c1b67..555a1c73369 100644
--- a/src/messages/MOSDPGRecoveryDelete.h
+++ b/src/messages/MOSDPGRecoveryDelete.h
@@ -10,7 +10,7 @@
  * instruct non-primary to remove some objects during recovery
  */
 
-class MOSDPGRecoveryDelete : public MOSDFastDispatchOp {
+class MOSDPGRecoveryDelete final : public MOSDFastDispatchOp {
 public:
   static constexpr int HEAD_VERSION = 2;
   static constexpr int COMPAT_VERSION = 1;
diff --git a/src/messages/MOSDPGRemove.h b/src/messages/MOSDPGRemove.h
index bb32f918104..3ac651ba793 100644
--- a/src/messages/MOSDPGRemove.h
+++ b/src/messages/MOSDPGRemove.h
@@ -20,7 +20,7 @@
 #include "msg/Message.h"
 
 
-class MOSDPGRemove : public Message {
+class MOSDPGRemove final : public Message {
 private:
   static constexpr int HEAD_VERSION = 3;
   static constexpr int COMPAT_VERSION = 3;
diff --git a/src/messages/MOSDPGScan.h b/src/messages/MOSDPGScan.h
index 42c3289b0cf..c80bb6efcb8 100644
--- a/src/messages/MOSDPGScan.h
+++ b/src/messages/MOSDPGScan.h
@@ -17,7 +17,7 @@
 
 #include "MOSDFastDispatchOp.h"
 
-class MOSDPGScan : public MOSDFastDispatchOp {
+class MOSDPGScan final : public MOSDFastDispatchOp {
 private:
   static constexpr int HEAD_VERSION = 2;
   static constexpr int COMPAT_VERSION = 2;
diff --git a/src/messages/MOSDPGTemp.h b/src/messages/MOSDPGTemp.h
index f3a3461e898..d73a767b7b3 100644
--- a/src/messages/MOSDPGTemp.h
+++ b/src/messages/MOSDPGTemp.h
@@ -19,7 +19,7 @@
 
 #include "messages/PaxosServiceMessage.h"
 
-class MOSDPGTemp : public PaxosServiceMessage {
+class MOSDPGTemp final : public PaxosServiceMessage {
 public:
   epoch_t map_epoch = 0;
   std::map<pg_t, std::vector<int32_t> > pg_temp;
diff --git a/src/messages/MOSDPGTrim.h b/src/messages/MOSDPGTrim.h
index 380b90292da..91ba1c78608 100644
--- a/src/messages/MOSDPGTrim.h
+++ b/src/messages/MOSDPGTrim.h
@@ -19,7 +19,7 @@
 #include "messages/MOSDPeeringOp.h"
 #include "osd/PGPeeringEvent.h"
 
-class MOSDPGTrim : public MOSDPeeringOp {
+class MOSDPGTrim final : public MOSDPeeringOp {
 private:
   static constexpr int HEAD_VERSION = 2;
   static constexpr int COMPAT_VERSION = 2;
diff --git a/src/messages/MOSDPGUpdateLogMissing.h b/src/messages/MOSDPGUpdateLogMissing.h
index bb0c26b47c5..2a0011e8fb7 100644
--- a/src/messages/MOSDPGUpdateLogMissing.h
+++ b/src/messages/MOSDPGUpdateLogMissing.h
@@ -18,7 +18,7 @@
 
 #include "MOSDFastDispatchOp.h"
 
-class MOSDPGUpdateLogMissing : public MOSDFastDispatchOp {
+class MOSDPGUpdateLogMissing final : public MOSDFastDispatchOp {
 private:
   static constexpr int HEAD_VERSION = 3;
   static constexpr int COMPAT_VERSION = 1;
diff --git a/src/messages/MOSDPGUpdateLogMissingReply.h b/src/messages/MOSDPGUpdateLogMissingReply.h
index ae16edbde46..559c14353cf 100644
--- a/src/messages/MOSDPGUpdateLogMissingReply.h
+++ b/src/messages/MOSDPGUpdateLogMissingReply.h
@@ -18,7 +18,7 @@
 
 #include "MOSDFastDispatchOp.h"
 
-class MOSDPGUpdateLogMissingReply : public MOSDFastDispatchOp {
+class MOSDPGUpdateLogMissingReply final : public MOSDFastDispatchOp {
 private:
   static constexpr int HEAD_VERSION = 3;
   static constexpr int COMPAT_VERSION = 1;
diff --git a/src/messages/MOSDPing.h b/src/messages/MOSDPing.h
index 97164894a27..8f512a7d718 100644
--- a/src/messages/MOSDPing.h
+++ b/src/messages/MOSDPing.h
@@ -32,7 +32,7 @@
 #include "osd/osd_types.h"
 
 
-class MOSDPing : public Message {
+class MOSDPing final : public Message {
 private:
   static constexpr int HEAD_VERSION = 5;
   static constexpr int COMPAT_VERSION = 4;
diff --git a/src/messages/MOSDRepOp.h b/src/messages/MOSDRepOp.h
index 08e7beb2ae8..5ecec0007e3 100644
--- a/src/messages/MOSDRepOp.h
+++ b/src/messages/MOSDRepOp.h
@@ -22,7 +22,7 @@
  * OSD sub op - for internal ops on pobjects between primary and replicas(/stripes/whatever)
  */
 
-class MOSDRepOp : public MOSDFastDispatchOp {
+class MOSDRepOp final : public MOSDFastDispatchOp {
 private:
   static constexpr int HEAD_VERSION = 3;
   static constexpr int COMPAT_VERSION = 1;
diff --git a/src/messages/MOSDRepOpReply.h b/src/messages/MOSDRepOpReply.h
index 84e92c4c8ad..8974b4b0fbf 100644
--- a/src/messages/MOSDRepOpReply.h
+++ b/src/messages/MOSDRepOpReply.h
@@ -27,7 +27,7 @@
  *
  */
 
-class MOSDRepOpReply : public MOSDFastDispatchOp {
+class MOSDRepOpReply final : public MOSDFastDispatchOp {
 private:
   static constexpr int HEAD_VERSION = 2;
   static constexpr int COMPAT_VERSION = 1;
diff --git a/src/messages/MOSDRepScrub.h b/src/messages/MOSDRepScrub.h
index 9f50f742c84..5b9eaae1854 100644
--- a/src/messages/MOSDRepScrub.h
+++ b/src/messages/MOSDRepScrub.h
@@ -22,7 +22,7 @@
  * instruct an OSD initiate a replica scrub on a specific PG
  */
 
-class MOSDRepScrub : public MOSDFastDispatchOp {
+class MOSDRepScrub final : public MOSDFastDispatchOp {
 public:
   static constexpr int HEAD_VERSION = 9;
   static constexpr int COMPAT_VERSION = 6;
diff --git a/src/messages/MOSDRepScrubMap.h b/src/messages/MOSDRepScrubMap.h
index 03831086018..51e8b02ee6f 100644
--- a/src/messages/MOSDRepScrubMap.h
+++ b/src/messages/MOSDRepScrubMap.h
@@ -21,7 +21,7 @@
  * pass a ScrubMap from a shard back to the primary
  */
 
-class MOSDRepScrubMap : public MOSDFastDispatchOp {
+class MOSDRepScrubMap final : public MOSDFastDispatchOp {
 public:
   static constexpr int HEAD_VERSION = 2;
   static constexpr int COMPAT_VERSION = 1;
diff --git a/src/messages/MOSDScrub.h b/src/messages/MOSDScrub.h
index f9c62f4a3e0..4f850fad70b 100644
--- a/src/messages/MOSDScrub.h
+++ b/src/messages/MOSDScrub.h
@@ -22,7 +22,7 @@
  * instruct an OSD to scrub some or all pg(s)
  */
 
-class MOSDScrub : public Message {
+class MOSDScrub final : public Message {
 public:
   static constexpr int HEAD_VERSION = 2;
   static constexpr int COMPAT_VERSION = 2;
diff --git a/src/messages/MOSDScrub2.h b/src/messages/MOSDScrub2.h
index 0e8b79b666a..61bafba24ae 100644
--- a/src/messages/MOSDScrub2.h
+++ b/src/messages/MOSDScrub2.h
@@ -9,7 +9,7 @@
  * instruct an OSD to scrub some or all pg(s)
  */
 
-class MOSDScrub2 : public Message {
+class MOSDScrub2 final : public Message {
 public:
   static constexpr int HEAD_VERSION = 1;
   static constexpr int COMPAT_VERSION = 1;
diff --git a/src/messages/MPGStats.h b/src/messages/MPGStats.h
index 135b8e93d61..65cec524478 100644
--- a/src/messages/MPGStats.h
+++ b/src/messages/MPGStats.h
@@ -18,7 +18,7 @@
 #include "osd/osd_types.h"
 #include "messages/PaxosServiceMessage.h"
 
-class MPGStats : public PaxosServiceMessage {
+class MPGStats final : public PaxosServiceMessage {
   static constexpr int HEAD_VERSION = 2;
   static constexpr int COMPAT_VERSION = 1;
 
diff --git a/src/messages/MPGStatsAck.h b/src/messages/MPGStatsAck.h
index 996cd764b6a..03bade32bfe 100644
--- a/src/messages/MPGStatsAck.h
+++ b/src/messages/MPGStatsAck.h
@@ -17,7 +17,7 @@
 
 #include "osd/osd_types.h"
 
-class MPGStatsAck : public Message {
+class MPGStatsAck final : public Message {
 public:
   std::map<pg_t,std::pair<version_t,epoch_t> > pg_stat;
 
diff --git a/src/messages/MPing.h b/src/messages/MPing.h
index 1397fd69fb0..bff4326ee91 100644
--- a/src/messages/MPing.h
+++ b/src/messages/MPing.h
@@ -18,7 +18,7 @@
 
 #include "msg/Message.h"
 
-class MPing : public Message {
+class MPing final : public Message {
 public:
   MPing() : Message{CEPH_MSG_PING} {}
 private:
diff --git a/src/messages/MPoolOp.h b/src/messages/MPoolOp.h
index 49a8a7f2a67..0e53c56b963 100644
--- a/src/messages/MPoolOp.h
+++ b/src/messages/MPoolOp.h
@@ -18,7 +18,7 @@
 #include "messages/PaxosServiceMessage.h"
 
 
-class MPoolOp : public PaxosServiceMessage {
+class MPoolOp final : public PaxosServiceMessage {
 private:
   static constexpr int HEAD_VERSION = 4;
   static constexpr int COMPAT_VERSION = 2;
diff --git a/src/messages/MRemoveSnaps.h b/src/messages/MRemoveSnaps.h
index 0a5bd073880..c0217f8322a 100644
--- a/src/messages/MRemoveSnaps.h
+++ b/src/messages/MRemoveSnaps.h
@@ -17,7 +17,7 @@
 
 #include "messages/PaxosServiceMessage.h"
 
-class MRemoveSnaps : public PaxosServiceMessage {
+class MRemoveSnaps final : public PaxosServiceMessage {
 public:
   std::map<int32_t, std::vector<snapid_t>> snaps;
 
diff --git a/src/messages/MRoute.h b/src/messages/MRoute.h
index 44c066240b5..4154434af5c 100644
--- a/src/messages/MRoute.h
+++ b/src/messages/MRoute.h
@@ -20,7 +20,7 @@
 #include "msg/Message.h"
 #include "include/encoding.h"
 
-class MRoute : public Message {
+class MRoute final : public Message {
 public:
   static constexpr int HEAD_VERSION = 3;
   static constexpr int COMPAT_VERSION = 3;
diff --git a/src/messages/MServiceMap.h b/src/messages/MServiceMap.h
index 5d8f43a3473..05954354a88 100644
--- a/src/messages/MServiceMap.h
+++ b/src/messages/MServiceMap.h
@@ -6,7 +6,7 @@
 #include "msg/Message.h"
 #include "mgr/ServiceMap.h"
 
-class MServiceMap : public Message {
+class MServiceMap final : public Message {
 public:
   ServiceMap service_map;
 
diff --git a/src/messages/MStatfs.h b/src/messages/MStatfs.h
index dc6cca307e1..41b236a9eee 100644
--- a/src/messages/MStatfs.h
+++ b/src/messages/MStatfs.h
@@ -19,7 +19,7 @@
 #include <sys/statvfs.h>    /* or <sys/statfs.h> */
 #include "messages/PaxosServiceMessage.h"
 
-class MStatfs : public PaxosServiceMessage {
+class MStatfs final : public PaxosServiceMessage {
 private:
   static constexpr int HEAD_VERSION = 2;
   static constexpr int COMPAT_VERSION = 1;
diff --git a/src/messages/MTimeCheck.h b/src/messages/MTimeCheck.h
index ff955eb59e5..03cd157f2d0 100644
--- a/src/messages/MTimeCheck.h
+++ b/src/messages/MTimeCheck.h
@@ -15,7 +15,7 @@
 #ifndef CEPH_MTIMECHECK_H
 #define CEPH_MTIMECHECK_H
 
-class MTimeCheck : public Message {
+class MTimeCheck final : public Message {
 public:
   static constexpr int HEAD_VERSION = 1;
 
diff --git a/src/messages/MTimeCheck2.h b/src/messages/MTimeCheck2.h
index f2b083af509..8d9c4215fd4 100644
--- a/src/messages/MTimeCheck2.h
+++ b/src/messages/MTimeCheck2.h
@@ -14,7 +14,7 @@
 
 #pragma once
 
-class MTimeCheck2 : public Message {
+class MTimeCheck2 final : public Message {
 public:
   static constexpr int HEAD_VERSION = 1;
   static constexpr int COMPAT_VERSION = 1;
diff --git a/src/messages/MWatchNotify.h b/src/messages/MWatchNotify.h
index a6ef02664a0..971c860c760 100644
--- a/src/messages/MWatchNotify.h
+++ b/src/messages/MWatchNotify.h
@@ -19,7 +19,7 @@
 #include "msg/Message.h"
 
 
-class MWatchNotify : public Message {
+class MWatchNotify final : public Message {
 private:
   static constexpr int HEAD_VERSION = 3;
   static constexpr int COMPAT_VERSION = 1;