From: liuchang0812 <liuchang0812@gmail.com>
Date: Wed, 22 Feb 2017 11:45:41 +0000 (+0800)
Subject: common: add override in msg subsystem
X-Git-Tag: v12.0.1~132^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ab9f6cea59bfae234ca45159079087403eb2ed43;p=ceph.git

common: add override in msg subsystem

Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
---

diff --git a/src/messages/MAuth.h b/src/messages/MAuth.h
index 40a7fa5e3ea..0a2b4302581 100644
--- a/src/messages/MAuth.h
+++ b/src/messages/MAuth.h
@@ -26,16 +26,16 @@ struct MAuth : public PaxosServiceMessage {
 
   MAuth() : PaxosServiceMessage(CEPH_MSG_AUTH, 0), protocol(0), monmap_epoch(0) { }
 private:
-  ~MAuth() {}
+  ~MAuth() override {}
 
 public:
-  const char *get_type_name() const { return "auth"; }
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "auth"; }
+  void print(ostream& out) const override {
     out << "auth(proto " << protocol << " " << auth_payload.length() << " bytes"
 	<< " epoch " << monmap_epoch << ")";
   }
 
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     paxos_decode(p);
     ::decode(protocol, p);
@@ -45,7 +45,7 @@ public:
     else
       monmap_epoch = 0;
   }
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     paxos_encode();
     ::encode(protocol, payload);
     ::encode(auth_payload, payload);
diff --git a/src/messages/MAuthReply.h b/src/messages/MAuthReply.h
index af9e884899a..161fe644ba1 100644
--- a/src/messages/MAuthReply.h
+++ b/src/messages/MAuthReply.h
@@ -34,18 +34,18 @@ struct MAuthReply : public Message {
       result_bl = *bl;
   }
 private:
-  ~MAuthReply() {}
+  ~MAuthReply() override {}
 
 public:
-  const char *get_type_name() const { return "auth_reply"; }
-  void print(ostream& o) const {
+  const char *get_type_name() const override { return "auth_reply"; }
+  void print(ostream& o) const override {
     o << "auth_reply(proto " << protocol << " " << result << " " << cpp_strerror(result);
     if (result_msg.length())
       o << ": " << result_msg;
     o << ")";
   }
 
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(protocol, p);
     ::decode(result, p);
@@ -53,7 +53,7 @@ public:
     ::decode(result_bl, p);
     ::decode(result_msg, p);
   }
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(protocol, payload);
     ::encode(result, payload);
     ::encode(global_id, payload);
diff --git a/src/messages/MBackfillReserve.h b/src/messages/MBackfillReserve.h
index 0bce15e86b0..41f33557a18 100644
--- a/src/messages/MBackfillReserve.h
+++ b/src/messages/MBackfillReserve.h
@@ -41,11 +41,11 @@ public:
       pgid(pgid), query_epoch(query_epoch),
       type(type), priority(prio) {}
 
-  const char *get_type_name() const {
+  const char *get_type_name() const override {
     return "MBackfillReserve";
   }
 
-  void print(ostream& out) const {
+  void print(ostream& out) const override {
     out << "MBackfillReserve ";
     switch (type) {
     case REQUEST:
@@ -63,7 +63,7 @@ public:
     return;
   }
 
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(pgid.pgid, p);
     ::decode(query_epoch, p);
@@ -79,7 +79,7 @@ public:
 
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(pgid.pgid, payload);
     ::encode(query_epoch, payload);
     ::encode(type, payload);
diff --git a/src/messages/MCacheExpire.h b/src/messages/MCacheExpire.h
index b71ada74190..a6014fcadd9 100644
--- a/src/messages/MCacheExpire.h
+++ b/src/messages/MCacheExpire.h
@@ -65,10 +65,10 @@ public:
     Message(MSG_MDS_CACHEEXPIRE),
     from(f) { }
 private:
-  ~MCacheExpire() {}
+  ~MCacheExpire() override {}
 
 public:
-  virtual const char *get_type_name() const { return "cache_expire";}
+  const char *get_type_name() const override { return "cache_expire";}
   
   void add_inode(dirfrag_t r, vinodeno_t vino, unsigned nonce) {
     realms[r].inodes[vino] = nonce;
@@ -87,13 +87,13 @@ public:
       realms[df].merge(r);
   }
 
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(from, p);
     ::decode(realms, p);
   }
     
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(from, payload);
     ::encode(realms, payload);
   }
diff --git a/src/messages/MClientCapRelease.h b/src/messages/MClientCapRelease.h
index 37330b70cd1..4b3c930a5c5 100644
--- a/src/messages/MClientCapRelease.h
+++ b/src/messages/MClientCapRelease.h
@@ -36,15 +36,15 @@ class MClientCapRelease : public Message {
     memset(&head, 0, sizeof(head));
   }
 private:
-  ~MClientCapRelease() {}
+  ~MClientCapRelease() override {}
 
 public:
-  const char *get_type_name() const { return "client_cap_release";}
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "client_cap_release";}
+  void print(ostream& out) const override {
     out << "client_cap_release(" << caps.size() << ")";
   }
   
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(head, p);
     ::decode_nohead(head.num, caps, p);
@@ -52,7 +52,7 @@ public:
       ::decode(osd_epoch_barrier, p);
     }
   }
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     head.num = caps.size();
     ::encode(head, payload);
     ::encode_nohead(caps, payload);
diff --git a/src/messages/MClientCaps.h b/src/messages/MClientCaps.h
index b5e9a51ed66..1db9bd16b62 100644
--- a/src/messages/MClientCaps.h
+++ b/src/messages/MClientCaps.h
@@ -188,11 +188,11 @@ class MClientCaps : public Message {
 private:
   file_layout_t layout;
 
-  ~MClientCaps() {}
+  ~MClientCaps() override {}
 
 public:
-  const char *get_type_name() const { return "Cfcap";}
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "Cfcap";}
+  void print(ostream& out) const override {
     out << "client_caps(" << ceph_cap_op_name(head.op)
 	<< " ino " << inodeno_t(head.ino)
 	<< " " << head.cap_id
@@ -219,7 +219,7 @@ public:
     out << ")";
   }
   
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(head, p);
     ceph_mds_caps_body_legacy body;
@@ -280,7 +280,7 @@ public:
       ::decode(flags, p);
     }
   }
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     header.version = HEAD_VERSION;
     head.snap_trace_len = snapbl.length();
     head.xattr_len = xattrbl.length();
diff --git a/src/messages/MClientLease.h b/src/messages/MClientLease.h
index 2b80c2ad234..33d146c0ac6 100644
--- a/src/messages/MClientLease.h
+++ b/src/messages/MClientLease.h
@@ -52,11 +52,11 @@ struct MClientLease : public Message {
     h.duration_ms = 0;
   }
 private:
-  ~MClientLease() {}
+  ~MClientLease() override {}
 
 public:
-  const char *get_type_name() const { return "client_lease"; }
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "client_lease"; }
+  void print(ostream& out) const override {
     out << "client_lease(a=" << ceph_lease_op_name(get_action())
 	<< " seq " << get_seq()
 	<< " mask " << get_mask();
@@ -68,12 +68,12 @@ public:
     out << ")";
   }
   
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(h, p);
     ::decode(dname, p);
   }
-  virtual void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(h, payload);
     ::encode(dname, payload);
   }
diff --git a/src/messages/MClientQuota.h b/src/messages/MClientQuota.h
index 2acac837210..3c8ad4ea746 100644
--- a/src/messages/MClientQuota.h
+++ b/src/messages/MClientQuota.h
@@ -16,18 +16,18 @@ struct MClientQuota : public Message {
     memset(&quota, 0, sizeof(quota));
   }
 private:
-  ~MClientQuota() {}
+  ~MClientQuota() override {}
 
 public:
-  const char *get_type_name() const { return "client_quota"; }
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "client_quota"; }
+  void print(ostream& out) const override {
     out << "client_quota(";
     out << " [" << ino << "] ";
     out << rstat;
     out << ")";
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(ino, payload);
     ::encode(rstat.rctime, payload);
     ::encode(rstat.rbytes, payload);
@@ -35,7 +35,7 @@ public:
     ::encode(rstat.rsubdirs, payload);
     ::encode(quota, payload);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(ino, p);
     ::decode(rstat.rctime, p);
diff --git a/src/messages/MClientReconnect.h b/src/messages/MClientReconnect.h
index bfb80699d14..86b83a4ac73 100644
--- a/src/messages/MClientReconnect.h
+++ b/src/messages/MClientReconnect.h
@@ -30,11 +30,11 @@ public:
 
   MClientReconnect() : Message(CEPH_MSG_CLIENT_RECONNECT, HEAD_VERSION) { }
 private:
-  ~MClientReconnect() {}
+  ~MClientReconnect() override {}
 
 public:
-  const char *get_type_name() const { return "client_reconnect"; }
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "client_reconnect"; }
+  void print(ostream& out) const override {
     out << "client_reconnect("
 	<< caps.size() << " caps)";
   }
@@ -52,7 +52,7 @@ public:
     realms.push_back(r);
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     data.clear();
     if (features & CEPH_FEATURE_MDSENC) {
       ::encode(caps, data);
@@ -76,7 +76,7 @@ public:
     }
     ::encode_nohead(realms, data);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = data.begin();
     if (header.version >= 3) {
       // new protocol
diff --git a/src/messages/MClientReply.h b/src/messages/MClientReply.h
index c5e7d3912de..dc7e7e342b7 100644
--- a/src/messages/MClientReply.h
+++ b/src/messages/MClientReply.h
@@ -233,11 +233,11 @@ public:
     head.safe = 1;
   }
 private:
-  ~MClientReply() {}
+  ~MClientReply() override {}
 
 public:
-  const char *get_type_name() const { return "creply"; }
-  void print(ostream& o) const {
+  const char *get_type_name() const override { return "creply"; }
+  void print(ostream& o) const override {
     o << "client_reply(???:" << get_tid();
     o << " = " << get_result();
     if (get_result() <= 0) {
@@ -253,7 +253,7 @@ public:
   }
 
   // serialization
-  virtual void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(head, p);
     ::decode(trace_bl, p);
@@ -261,7 +261,7 @@ public:
     ::decode(snapbl, p);
     assert(p.end());
   }
-  virtual void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(head, payload);
     ::encode(trace_bl, payload);
     ::encode(extra_bl, payload);
diff --git a/src/messages/MClientRequest.h b/src/messages/MClientRequest.h
index 2fba0ca6d15..c744eb7faab 100644
--- a/src/messages/MClientRequest.h
+++ b/src/messages/MClientRequest.h
@@ -90,7 +90,7 @@ public:
     head.op = op;
   }
 private:
-  ~MClientRequest() {}
+  ~MClientRequest() override {}
 
 public:
   void set_mdsmap_epoch(epoch_t e) { head.mdsmap_epoch = e; }
@@ -167,7 +167,7 @@ public:
 
   int get_dentry_wanted() { return get_flags() & CEPH_MDS_FLAG_WANT_DENTRY; }
 
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
 
     if (header.version >= 4) {
@@ -199,7 +199,7 @@ public:
       ::decode(gid_list, p);
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     head.num_releases = releases.size();
     head.version = CEPH_MDS_REQUEST_HEAD_VERSION;
 
@@ -219,8 +219,8 @@ public:
     ::encode(gid_list, payload);
   }
 
-  const char *get_type_name() const { return "creq"; }
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "creq"; }
+  void print(ostream& out) const override {
     out << "client_request(" << get_orig_source() 
 	<< ":" << get_tid() 
 	<< " " << ceph_mds_op_name(get_op());
diff --git a/src/messages/MClientRequestForward.h b/src/messages/MClientRequestForward.h
index 57703619220..9312849f88e 100644
--- a/src/messages/MClientRequestForward.h
+++ b/src/messages/MClientRequestForward.h
@@ -34,15 +34,15 @@ class MClientRequestForward : public Message {
     header.tid = t;
   }
 private:
-  ~MClientRequestForward() {}
+  ~MClientRequestForward() override {}
 
 public:
   int get_dest_mds() { return dest_mds; }
   int get_num_fwd() { return num_fwd; }
   bool must_resend() { return client_must_resend; }
 
-  const char *get_type_name() const { return "client_request_forward"; }
-  void print(ostream& o) const {
+  const char *get_type_name() const override { return "client_request_forward"; }
+  void print(ostream& o) const override {
     o << "client_request_forward(" << get_tid()
       << " to mds." << dest_mds
       << " num_fwd=" << num_fwd
@@ -50,13 +50,13 @@ public:
       << ")";
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(dest_mds, payload);
     ::encode(num_fwd, payload);
     ::encode(client_must_resend, payload);
   }
 
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(dest_mds, p);
     ::decode(num_fwd, p);
diff --git a/src/messages/MClientSession.h b/src/messages/MClientSession.h
index 8975b18bce6..c94100408df 100644
--- a/src/messages/MClientSession.h
+++ b/src/messages/MClientSession.h
@@ -47,11 +47,11 @@ public:
     st.encode_timeval(&head.stamp);
   }
 private:
-  ~MClientSession() {}
+  ~MClientSession() override {}
 
 public:
-  const char *get_type_name() const { return "client_session"; }
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "client_session"; }
+  void print(ostream& out) const override {
     out << "client_session(" << ceph_session_op_name(get_op());
     if (get_seq())
       out << " seq " << get_seq();
@@ -60,14 +60,14 @@ public:
     out << ")";
   }
 
-  void decode_payload() { 
+  void decode_payload() override { 
     bufferlist::iterator p = payload.begin();
     ::decode(head, p);
     if (header.version >= 2) {
       ::decode(client_meta, p);
     }
   }
-  void encode_payload(uint64_t features) { 
+  void encode_payload(uint64_t features) override { 
     ::encode(head, payload);
     if (client_meta.empty()) {
       // If we're not trying to send any metadata (always the case if
diff --git a/src/messages/MClientSnap.h b/src/messages/MClientSnap.h
index 7f7283e3405..8e572bfd88d 100644
--- a/src/messages/MClientSnap.h
+++ b/src/messages/MClientSnap.h
@@ -31,11 +31,11 @@ struct MClientSnap : public Message {
     head.op = o;
   }
 private:
-  ~MClientSnap() {}
+  ~MClientSnap() override {}
 
 public:  
-  const char *get_type_name() const { return "client_snap"; }
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "client_snap"; }
+  void print(ostream& out) const override {
     out << "client_snap(" << ceph_snap_op_name(head.op);
     if (head.split)
       out << " split=" << inodeno_t(head.split);
@@ -43,7 +43,7 @@ public:
     out << ")";
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     head.num_split_inos = split_inos.size();
     head.num_split_realms = split_realms.size();
     head.trace_len = bl.length();
@@ -52,7 +52,7 @@ public:
     ::encode_nohead(split_realms, payload);
     ::encode_nohead(bl, payload);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(head, p);
     ::decode_nohead(head.num_split_inos, split_inos, p);
diff --git a/src/messages/MCommand.h b/src/messages/MCommand.h
index d5f0b22f024..f1077644f3f 100644
--- a/src/messages/MCommand.h
+++ b/src/messages/MCommand.h
@@ -31,11 +31,11 @@ class MCommand : public Message {
       fsid(f) { }
 
 private:
-  ~MCommand() {}
+  ~MCommand() override {}
 
 public:  
-  const char *get_type_name() const { return "command"; }
-  void print(ostream& o) const {
+  const char *get_type_name() const override { return "command"; }
+  void print(ostream& o) const override {
     o << "command(tid " << get_tid() << ": ";
     for (unsigned i=0; i<cmd.size(); i++) {
       if (i) o << ' ';
@@ -44,11 +44,11 @@ public:
     o << ")";
   }
   
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(fsid, payload);
     ::encode(cmd, payload);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(fsid, p);
     ::decode(cmd, p);
diff --git a/src/messages/MCommandReply.h b/src/messages/MCommandReply.h
index 6abd6fe8411..9bb803dd579 100644
--- a/src/messages/MCommandReply.h
+++ b/src/messages/MCommandReply.h
@@ -33,19 +33,19 @@ class MCommandReply : public Message {
     : Message(MSG_COMMAND_REPLY),
       r(_r), rs(s) { }
 private:
-  ~MCommandReply() {}
+  ~MCommandReply() override {}
 
 public:
-  const char *get_type_name() const { return "command_reply"; }
-  void print(ostream& o) const {
+  const char *get_type_name() const override { return "command_reply"; }
+  void print(ostream& o) const override {
     o << "command_reply(tid " << get_tid() << ": " << r << " " << rs << ")";
   }
   
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(r, payload);
     ::encode(rs, payload);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(r, p);
     ::decode(rs, p);
diff --git a/src/messages/MDataPing.h b/src/messages/MDataPing.h
index f713dac7f76..0202d78b196 100644
--- a/src/messages/MDataPing.h
+++ b/src/messages/MDataPing.h
@@ -58,7 +58,7 @@ class MDataPing : public Message {
     }
 
 private:
-  ~MDataPing()
+  ~MDataPing() override
     {
       if (mdata_hook)
 	mdata_hook(&mp);
@@ -73,19 +73,19 @@ private:
     }
 
 public:
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(tag, p);
     ::decode(counter, p);
   }
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(tag, payload);
     ::encode(counter, payload);
   }
 
-  const char *get_type_name() const { return "data_ping"; }
+  const char *get_type_name() const override { return "data_ping"; }
 
-  void print(ostream& out) const {
+  void print(ostream& out) const override {
     out << get_type_name() << " " << tag << " " << counter;
   }
 };
diff --git a/src/messages/MDentryLink.h b/src/messages/MDentryLink.h
index b351532799b..1c6397acd40 100644
--- a/src/messages/MDentryLink.h
+++ b/src/messages/MDentryLink.h
@@ -39,15 +39,15 @@ class MDentryLink : public Message {
     dn(n),
     is_primary(p) {}
 private:
-  ~MDentryLink() {}
+  ~MDentryLink() override {}
 
 public:
-  const char *get_type_name() const { return "dentry_link";}
-  void print(ostream& o) const {
+  const char *get_type_name() const override { return "dentry_link";}
+  void print(ostream& o) const override {
     o << "dentry_link(" << dirfrag << " " << dn << ")";
   }
   
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(subtree, p);
     ::decode(dirfrag, p);
@@ -55,7 +55,7 @@ public:
     ::decode(is_primary, p);
     ::decode(bl, p);
   }
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(subtree, payload);
     ::encode(dirfrag, payload);
     ::encode(dn, payload);
diff --git a/src/messages/MDentryUnlink.h b/src/messages/MDentryUnlink.h
index 1cae33fbb83..baf54ae0a41 100644
--- a/src/messages/MDentryUnlink.h
+++ b/src/messages/MDentryUnlink.h
@@ -33,21 +33,21 @@ class MDentryUnlink : public Message {
     dirfrag(df),
     dn(n) {}
 private:
-  ~MDentryUnlink() {}
+  ~MDentryUnlink() override {}
 
 public:
-  const char *get_type_name() const { return "dentry_unlink";}
-  void print(ostream& o) const {
+  const char *get_type_name() const override { return "dentry_unlink";}
+  void print(ostream& o) const override {
     o << "dentry_unlink(" << dirfrag << " " << dn << ")";
   }
   
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(dirfrag, p);
     ::decode(dn, p);
     ::decode(straybl, p);
   }
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(dirfrag, payload);
     ::encode(dn, payload);
     ::encode(straybl, payload);
diff --git a/src/messages/MDirUpdate.h b/src/messages/MDirUpdate.h
index 727db238d31..e282b04d386 100644
--- a/src/messages/MDirUpdate.h
+++ b/src/messages/MDirUpdate.h
@@ -55,15 +55,15 @@ class MDirUpdate : public Message {
     this->path = path;
   }
 private:
-  ~MDirUpdate() {}
+  ~MDirUpdate() override {}
 
 public:
-  const char *get_type_name() const { return "dir_update"; }
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "dir_update"; }
+  void print(ostream& out) const override {
     out << "dir_update(" << get_dirfrag() << ")";
   }
 
-  virtual void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(from_mds, p);
     ::decode(dirfrag, p);
@@ -73,7 +73,7 @@ public:
     ::decode(path, p);
   }
 
-  virtual void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(from_mds, payload);
     ::encode(dirfrag, payload);
     ::encode(dir_rep, payload);
diff --git a/src/messages/MDiscover.h b/src/messages/MDiscover.h
index aab6ccb351e..50b5d11b52f 100644
--- a/src/messages/MDiscover.h
+++ b/src/messages/MDiscover.h
@@ -60,16 +60,16 @@ class MDiscover : public Message {
     want_base_dir(want_base_dir_),
     want_xlocked(discover_xlocks_) { }
 private:
-  ~MDiscover() {}
+  ~MDiscover() override {}
 
 public:
-  const char *get_type_name() const { return "Dis"; }
-  void print(ostream &out) const {
+  const char *get_type_name() const override { return "Dis"; }
+  void print(ostream &out) const override {
     out << "discover(" << header.tid << " " << base_ino << "." << base_dir_frag
 	<< " " << want << ")";
   }
 
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(base_ino, p);
     ::decode(base_dir_frag, p);
@@ -78,7 +78,7 @@ public:
     ::decode(want_base_dir, p);
     ::decode(want_xlocked, p);
   }
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(base_ino, payload);
     ::encode(base_dir_frag, payload);
     ::encode(snapid, payload);
diff --git a/src/messages/MDiscoverReply.h b/src/messages/MDiscoverReply.h
index dfb27606dca..8498d51357b 100644
--- a/src/messages/MDiscoverReply.h
+++ b/src/messages/MDiscoverReply.h
@@ -141,11 +141,11 @@ class MDiscoverReply : public Message {
     header.tid = 0;
   }
 private:
-  ~MDiscoverReply() {}
+  ~MDiscoverReply() override {}
 
 public:
-  const char *get_type_name() const { return "discover_reply"; }
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "discover_reply"; }
+  void print(ostream& out) const override {
     out << "discover_reply(" << header.tid << " " << base_ino << ")";
   }
   
@@ -174,7 +174,7 @@ public:
 
 
   // ...
-  virtual void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(base_ino, p);
     ::decode(base_dir_frag, p);
@@ -190,7 +190,7 @@ public:
     ::decode(starts_with, p);
     ::decode(trace, p);
   }
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(base_ino, payload);
     ::encode(base_dir_frag, payload);
     ::encode(wanted_base_dir, payload);
diff --git a/src/messages/MExportCaps.h b/src/messages/MExportCaps.h
index 43b786888e8..8ce4b858de9 100644
--- a/src/messages/MExportCaps.h
+++ b/src/messages/MExportCaps.h
@@ -28,20 +28,20 @@ class MExportCaps : public Message {
   MExportCaps() :
     Message(MSG_MDS_EXPORTCAPS) {}
 private:
-  ~MExportCaps() {}
+  ~MExportCaps() override {}
 
 public:
-  const char *get_type_name() const { return "export_caps"; }
-  void print(ostream& o) const {
+  const char *get_type_name() const override { return "export_caps"; }
+  void print(ostream& o) const override {
     o << "export_caps(" << ino << ")";
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(ino, payload);
     ::encode(cap_bl, payload);
     ::encode(client_map, payload, features);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(ino, p);
     ::decode(cap_bl, p);
diff --git a/src/messages/MExportCapsAck.h b/src/messages/MExportCapsAck.h
index b8fcf1fa9ca..5a21d9465de 100644
--- a/src/messages/MExportCapsAck.h
+++ b/src/messages/MExportCapsAck.h
@@ -28,18 +28,18 @@ class MExportCapsAck : public Message {
   MExportCapsAck(inodeno_t i) :
     Message(MSG_MDS_EXPORTCAPSACK), ino(i) {}
 private:
-  ~MExportCapsAck() {}
+  ~MExportCapsAck() override {}
 
 public:
-  const char *get_type_name() const { return "export_caps_ack"; }
-  void print(ostream& o) const {
+  const char *get_type_name() const override { return "export_caps_ack"; }
+  void print(ostream& o) const override {
     o << "export_caps_ack(" << ino << ")";
   }
 
-  virtual void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(ino, payload);
   }
-  virtual void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(ino, p);
   }
diff --git a/src/messages/MExportDir.h b/src/messages/MExportDir.h
index 2ff85d4f212..8271d80de3c 100644
--- a/src/messages/MExportDir.h
+++ b/src/messages/MExportDir.h
@@ -32,11 +32,11 @@ class MExportDir : public Message {
     set_tid(tid);
   }
 private:
-  ~MExportDir() {}
+  ~MExportDir() override {}
 
 public:
-  const char *get_type_name() const { return "Ex"; }
-  void print(ostream& o) const {
+  const char *get_type_name() const override { return "Ex"; }
+  void print(ostream& o) const override {
     o << "export(" << dirfrag << ")";
   }
 
@@ -44,13 +44,13 @@ public:
     bounds.push_back(df); 
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(dirfrag, payload);
     ::encode(bounds, payload);
     ::encode(export_data, payload);
     ::encode(client_map, payload);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(dirfrag, p);
     ::decode(bounds, p);
diff --git a/src/messages/MExportDirAck.h b/src/messages/MExportDirAck.h
index eb23789eedd..f7b1beb9023 100644
--- a/src/messages/MExportDirAck.h
+++ b/src/messages/MExportDirAck.h
@@ -30,20 +30,20 @@ public:
     set_tid(tid);
   }
 private:
-  ~MExportDirAck() {}
+  ~MExportDirAck() override {}
 
 public:
-  const char *get_type_name() const { return "ExAck"; }
-    void print(ostream& o) const {
+  const char *get_type_name() const override { return "ExAck"; }
+    void print(ostream& o) const override {
     o << "export_ack(" << dirfrag << ")";
   }
 
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(dirfrag, p);
     ::decode(imported_caps, p);
   }
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(dirfrag, payload);
     ::encode(imported_caps, payload);
   }
diff --git a/src/messages/MExportDirCancel.h b/src/messages/MExportDirCancel.h
index b3b2c5825ef..a3c9c5172fb 100644
--- a/src/messages/MExportDirCancel.h
+++ b/src/messages/MExportDirCancel.h
@@ -30,18 +30,18 @@ class MExportDirCancel : public Message {
     set_tid(tid);
   }
 private:
-  ~MExportDirCancel() {}
+  ~MExportDirCancel() override {}
 
 public:
-  const char *get_type_name() const { return "ExCancel"; }
-  void print(ostream& o) const {
+  const char *get_type_name() const override { return "ExCancel"; }
+  void print(ostream& o) const override {
     o << "export_cancel(" << dirfrag << ")";
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(dirfrag, payload);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(dirfrag, p);
   }
diff --git a/src/messages/MExportDirDiscover.h b/src/messages/MExportDirDiscover.h
index c5bbcebd68b..17d2feaddca 100644
--- a/src/messages/MExportDirDiscover.h
+++ b/src/messages/MExportDirDiscover.h
@@ -40,22 +40,22 @@ class MExportDirDiscover : public Message {
     set_tid(tid);
   }
 private:
-  ~MExportDirDiscover() {}
+  ~MExportDirDiscover() override {}
 
 public:
-  const char *get_type_name() const { return "ExDis"; }
-  void print(ostream& o) const {
+  const char *get_type_name() const override { return "ExDis"; }
+  void print(ostream& o) const override {
     o << "export_discover(" << dirfrag << " " << path << ")";
   }
 
-  virtual void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(from, p);
     ::decode(dirfrag, p);
     ::decode(path, p);
   }
 
-  virtual void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(from, payload);
     ::encode(dirfrag, payload);
     ::encode(path, payload);
diff --git a/src/messages/MExportDirDiscoverAck.h b/src/messages/MExportDirDiscoverAck.h
index 8e20be604be..3b43cdab6bd 100644
--- a/src/messages/MExportDirDiscoverAck.h
+++ b/src/messages/MExportDirDiscoverAck.h
@@ -34,11 +34,11 @@ class MExportDirDiscoverAck : public Message {
     set_tid(tid);
   }
 private:
-  ~MExportDirDiscoverAck() {}
+  ~MExportDirDiscoverAck() override {}
 
 public:
-  const char *get_type_name() const { return "ExDisA"; }
-  void print(ostream& o) const {
+  const char *get_type_name() const override { return "ExDisA"; }
+  void print(ostream& o) const override {
     o << "export_discover_ack(" << dirfrag;
     if (success) 
       o << " success)";
@@ -46,12 +46,12 @@ public:
       o << " failure)";
   }
 
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(dirfrag, p);
     ::decode(success, p);
   }
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(dirfrag, payload);
     ::encode(success, payload);
   }
diff --git a/src/messages/MExportDirFinish.h b/src/messages/MExportDirFinish.h
index 397abc53d98..8cea97757dd 100644
--- a/src/messages/MExportDirFinish.h
+++ b/src/messages/MExportDirFinish.h
@@ -31,19 +31,19 @@ class MExportDirFinish : public Message {
     set_tid(tid);
   }
 private:
-  ~MExportDirFinish() {}
+  ~MExportDirFinish() override {}
 
 public:
-  const char *get_type_name() const { return "ExFin"; }
-  void print(ostream& o) const {
+  const char *get_type_name() const override { return "ExFin"; }
+  void print(ostream& o) const override {
     o << "export_finish(" << dirfrag << (last ? " last" : "") << ")";
   }
   
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(dirfrag, payload);
     ::encode(last, payload);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(dirfrag, p);
     ::decode(last, p);
diff --git a/src/messages/MExportDirNotify.h b/src/messages/MExportDirNotify.h
index bd5c2330d11..6f881412bac 100644
--- a/src/messages/MExportDirNotify.h
+++ b/src/messages/MExportDirNotify.h
@@ -37,11 +37,11 @@ class MExportDirNotify : public Message {
     set_tid(tid);
   }
 private:
-  ~MExportDirNotify() {}
+  ~MExportDirNotify() override {}
 
 public:
-  const char *get_type_name() const { return "ExNot"; }
-  void print(ostream& o) const {
+  const char *get_type_name() const override { return "ExNot"; }
+  void print(ostream& o) const override {
     o << "export_notify(" << base;
     o << " " << old_auth << " -> " << new_auth;
     if (ack) 
@@ -59,14 +59,14 @@ public:
       bounds.push_back(*i);
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(base, payload);
     ::encode(ack, payload);
     ::encode(old_auth, payload);
     ::encode(new_auth, payload);
     ::encode(bounds, payload);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(base, p);
     ::decode(ack, p);
diff --git a/src/messages/MExportDirNotifyAck.h b/src/messages/MExportDirNotifyAck.h
index 0695d3685e3..7edbbaf9f8f 100644
--- a/src/messages/MExportDirNotifyAck.h
+++ b/src/messages/MExportDirNotifyAck.h
@@ -31,19 +31,19 @@ class MExportDirNotifyAck : public Message {
     set_tid(tid);
   }
 private:
-  ~MExportDirNotifyAck() {}
+  ~MExportDirNotifyAck() override {}
 
 public:
-  const char *get_type_name() const { return "ExNotA"; }
-  void print(ostream& o) const {
+  const char *get_type_name() const override { return "ExNotA"; }
+  void print(ostream& o) const override {
     o << "export_notify_ack(" << dirfrag << ")";
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(dirfrag, payload);
     ::encode(new_auth, payload);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(dirfrag, p);
     ::decode(new_auth, p);
diff --git a/src/messages/MExportDirPrep.h b/src/messages/MExportDirPrep.h
index 23da166a320..22717dd61b0 100644
--- a/src/messages/MExportDirPrep.h
+++ b/src/messages/MExportDirPrep.h
@@ -46,11 +46,11 @@ public:
     set_tid(tid);
   }
 private:
-  ~MExportDirPrep() {}
+  ~MExportDirPrep() override {}
 
 public:
-  const char *get_type_name() const { return "ExP"; }
-  void print(ostream& o) const {
+  const char *get_type_name() const override { return "ExP"; }
+  void print(ostream& o) const override {
     o << "export_prep(" << dirfrag << ")";
   }
 
@@ -64,7 +64,7 @@ public:
     bystanders.insert(who);
   }
 
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(dirfrag, p);
     ::decode(basedir, p);
@@ -73,7 +73,7 @@ public:
     ::decode(bystanders, p);
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(dirfrag, payload);
     ::encode(basedir, payload);
     ::encode(bounds, payload);
diff --git a/src/messages/MExportDirPrepAck.h b/src/messages/MExportDirPrepAck.h
index 319194da801..bb9bb13778d 100644
--- a/src/messages/MExportDirPrepAck.h
+++ b/src/messages/MExportDirPrepAck.h
@@ -31,21 +31,21 @@ class MExportDirPrepAck : public Message {
     set_tid(tid);
   }
 private:
-  ~MExportDirPrepAck() {}
+  ~MExportDirPrepAck() override {}
 
 public:  
   bool is_success() { return success; }
-  const char *get_type_name() const { return "ExPAck"; }
-  void print(ostream& o) const {
+  const char *get_type_name() const override { return "ExPAck"; }
+  void print(ostream& o) const override {
     o << "export_prep_ack(" << dirfrag << (success ? " success)" : " fail)");
   }
 
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(dirfrag, p);
     ::decode(success, p);
   }
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(dirfrag, payload);
     ::encode(success, payload);
   }
diff --git a/src/messages/MFSMap.h b/src/messages/MFSMap.h
index 86206d6a3d9..6e1348bcc2e 100644
--- a/src/messages/MFSMap.h
+++ b/src/messages/MFSMap.h
@@ -38,21 +38,21 @@ class MFSMap : public Message {
 private:
   FSMap fsmap;
 
-  ~MFSMap() {}
+  ~MFSMap() override {}
 
 public:
-  const char *get_type_name() const { return "fsmap"; }
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "fsmap"; }
+  void print(ostream& out) const override {
     out << "fsmap(e " << epoch << ")";
   }
 
   // marshalling
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(epoch, p);
     ::decode(fsmap, p);
   }
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(epoch, payload);
     ::encode(fsmap, payload, features);
   }
diff --git a/src/messages/MFSMapUser.h b/src/messages/MFSMapUser.h
index ae222c27498..2cd94cfd482 100644
--- a/src/messages/MFSMapUser.h
+++ b/src/messages/MFSMapUser.h
@@ -36,21 +36,21 @@ class MFSMapUser : public Message {
 private:
   FSMapUser fsmap;
 
-  ~MFSMapUser() {}
+  ~MFSMapUser() override {}
 
 public:
-  const char *get_type_name() const { return "fsmap.user"; }
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "fsmap.user"; }
+  void print(ostream& out) const override {
     out << "fsmap.user(e " << epoch << ")";
   }
 
   // marshalling
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(epoch, p);
     ::decode(fsmap, p);
   }
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(epoch, payload);
     ::encode(fsmap, payload, features);
   }
diff --git a/src/messages/MForward.h b/src/messages/MForward.h
index 8eb0b17850c..5f464a1bb69 100644
--- a/src/messages/MForward.h
+++ b/src/messages/MForward.h
@@ -59,7 +59,7 @@ struct MForward : public Message {
     msg = (PaxosServiceMessage*)m->get();
   }
 private:
-  ~MForward() {
+  ~MForward() override {
     if (msg) {
       // message was unclaimed
       msg->put();
@@ -68,7 +68,7 @@ private:
   }
 
 public:
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(tid, payload);
     ::encode(client, payload, features);
     ::encode(client_caps, payload, features);
@@ -85,7 +85,7 @@ public:
     ::encode(entity_name, payload);
   }
 
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(tid, p);
     ::decode(client, p);
@@ -116,8 +116,8 @@ public:
     return m;
   }
 
-  const char *get_type_name() const { return "forward"; }
-  void print(ostream& o) const {
+  const char *get_type_name() const override { return "forward"; }
+  void print(ostream& o) const override {
     o << "forward(";
     if (msg) {
       o << *msg;
diff --git a/src/messages/MGatherCaps.h b/src/messages/MGatherCaps.h
index 0901331c090..4d73efad1a5 100644
--- a/src/messages/MGatherCaps.h
+++ b/src/messages/MGatherCaps.h
@@ -11,18 +11,18 @@ class MGatherCaps : public Message {
   MGatherCaps() :
     Message(MSG_MDS_GATHERCAPS) {}
 private:
-  ~MGatherCaps() {}
+  ~MGatherCaps() override {}
 
 public:
-  const char *get_type_name() const { return "gather_caps"; }
-  void print(ostream& o) const {
+  const char *get_type_name() const override { return "gather_caps"; }
+  void print(ostream& o) const override {
     o << "gather_caps(" << ino << ")";
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(ino, payload);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(ino, p);
   }
diff --git a/src/messages/MGenericMessage.h b/src/messages/MGenericMessage.h
index 6f326aa8cd0..d84209e36b4 100644
--- a/src/messages/MGenericMessage.h
+++ b/src/messages/MGenericMessage.h
@@ -30,10 +30,10 @@ class MGenericMessage : public Message {
   //void set_pcid(long pcid) { this->pcid = pcid; }
   //long get_pcid() { return pcid; }
 
-  const char *get_type_name() const { return tname; }
+  const char *get_type_name() const override { return tname; }
 
-  void decode_payload() { }
-  void encode_payload(uint64_t features) { }
+  void decode_payload() override { }
+  void encode_payload(uint64_t features) override { }
 };
 
 #endif
diff --git a/src/messages/MGetPoolStats.h b/src/messages/MGetPoolStats.h
index b66a5b850d6..ff6d2b103aa 100644
--- a/src/messages/MGetPoolStats.h
+++ b/src/messages/MGetPoolStats.h
@@ -31,20 +31,20 @@ public:
   }
 
 private:
-  ~MGetPoolStats() {}
+  ~MGetPoolStats() override {}
 
 public:
-  const char *get_type_name() const { return "getpoolstats"; }
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "getpoolstats"; }
+  void print(ostream& out) const override {
     out << "getpoolstats(" << get_tid() << " " << pools << " v" << version << ")";
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     paxos_encode();
     ::encode(fsid, payload);
     ::encode(pools, payload);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     paxos_decode(p);
     ::decode(fsid, p);
diff --git a/src/messages/MGetPoolStatsReply.h b/src/messages/MGetPoolStatsReply.h
index 9dc2cbe1759..de5719e9666 100644
--- a/src/messages/MGetPoolStatsReply.h
+++ b/src/messages/MGetPoolStatsReply.h
@@ -29,20 +29,20 @@ public:
   }
 
 private:
-  ~MGetPoolStatsReply() {}
+  ~MGetPoolStatsReply() override {}
 
 public:
-  const char *get_type_name() const { return "getpoolstats"; }
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "getpoolstats"; }
+  void print(ostream& out) const override {
     out << "getpoolstatsreply(" << get_tid() << " v" << version <<  ")";
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     paxos_encode();
     ::encode(fsid, payload);
     ::encode(pool_stats, payload, features);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     paxos_decode(p);
     ::decode(fsid, p);
diff --git a/src/messages/MHeartbeat.h b/src/messages/MHeartbeat.h
index c3f3610a8cb..6cf4a0e37e1 100644
--- a/src/messages/MHeartbeat.h
+++ b/src/messages/MHeartbeat.h
@@ -40,17 +40,17 @@ class MHeartbeat : public Message {
     this->beat = beat;
   }
 private:
-  ~MHeartbeat() {}
+  ~MHeartbeat() override {}
 
 public:
-  const char *get_type_name() const { return "HB"; }
+  const char *get_type_name() const override { return "HB"; }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(load, payload);
     ::encode(beat, payload);
     ::encode(import_map, payload);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     utime_t now(ceph_clock_now());
     ::decode(load, now, p);
diff --git a/src/messages/MInodeFileCaps.h b/src/messages/MInodeFileCaps.h
index bc4db2fc60a..e10c35c2416 100644
--- a/src/messages/MInodeFileCaps.h
+++ b/src/messages/MInodeFileCaps.h
@@ -31,19 +31,19 @@ class MInodeFileCaps : public Message {
     this->caps = caps;
   }
 private:
-  ~MInodeFileCaps() {}
+  ~MInodeFileCaps() override {}
 
 public:
-  const char *get_type_name() const { return "inode_file_caps";}
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "inode_file_caps";}
+  void print(ostream& out) const override {
     out << "inode_file_caps(" << ino << " " << ccap_string(caps) << ")";
   }
   
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(ino, payload);
     ::encode(caps, payload);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(ino, p);
     ::decode(caps, p);
diff --git a/src/messages/MLock.h b/src/messages/MLock.h
index 746efe4f618..9ca205d3a0f 100644
--- a/src/messages/MLock.h
+++ b/src/messages/MLock.h
@@ -56,11 +56,11 @@ public:
     lockdata.claim(bl);
   }
 private:
-  ~MLock() {}
+  ~MLock() override {}
   
 public:
-  const char *get_type_name() const { return "ILock"; }
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "ILock"; }
+  void print(ostream& out) const override {
     out << "lock(a=" << get_lock_action_name(action)
 	<< " " << get_lock_type_name(lock_type)
 	<< " " << object_info
@@ -72,7 +72,7 @@ public:
     this->lockdata = lockdata;
   }
   
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(asker, p);
     ::decode(action, p);
@@ -81,7 +81,7 @@ public:
     ::decode(object_info, p);
     ::decode(lockdata, p);
   }
-  virtual void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(asker, payload);
     ::encode(action, payload);
     ::encode(reqid, payload);
diff --git a/src/messages/MLog.h b/src/messages/MLog.h
index 40b131e7c6f..fb86930759c 100644
--- a/src/messages/MLog.h
+++ b/src/messages/MLog.h
@@ -30,11 +30,11 @@ public:
     : PaxosServiceMessage(MSG_LOG, 0), fsid(f), entries(e) { }
   MLog(const uuid_d& f) : PaxosServiceMessage(MSG_LOG, 0), fsid(f) { }
 private:
-  ~MLog() {}
+  ~MLog() override {}
 
 public:
-  const char *get_type_name() const { return "log"; }
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "log"; }
+  void print(ostream& out) const override {
     out << "log(";
     if (entries.size())
       out << entries.size() << " entries from seq " << entries.front().seq
@@ -42,12 +42,12 @@ public:
     out << ")";
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     paxos_encode();
     ::encode(fsid, payload);
     ::encode(entries, payload, features);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     paxos_decode(p);
     ::decode(fsid, p);
diff --git a/src/messages/MLogAck.h b/src/messages/MLogAck.h
index 414008c3e50..7ec173fa292 100644
--- a/src/messages/MLogAck.h
+++ b/src/messages/MLogAck.h
@@ -24,20 +24,20 @@ public:
   MLogAck() : Message(MSG_LOGACK) {}
   MLogAck(uuid_d& f, version_t l) : Message(MSG_LOGACK), fsid(f), last(l) {}
 private:
-  ~MLogAck() {}
+  ~MLogAck() override {}
 
 public:
-  const char *get_type_name() const { return "log_ack"; }
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "log_ack"; }
+  void print(ostream& out) const override {
     out << "log(last " << last << ")";
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(fsid, payload);
     ::encode(last, payload);
     ::encode(channel, payload);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(fsid, p);
     ::decode(last, p);
diff --git a/src/messages/MMDSBeacon.h b/src/messages/MMDSBeacon.h
index a67ba121943..0f31dfec8af 100644
--- a/src/messages/MMDSBeacon.h
+++ b/src/messages/MMDSBeacon.h
@@ -161,7 +161,7 @@ class MMDSBeacon : public PaxosServiceMessage {
     standby_replay(false), mds_features(feat) {
   }
 private:
-  ~MMDSBeacon() {}
+  ~MMDSBeacon() override {}
 
 public:
   uuid_d& get_fsid() { return fsid; }
@@ -170,7 +170,7 @@ public:
   epoch_t get_last_epoch_seen() { return version; }
   MDSMap::DaemonState get_state() { return state; }
   version_t get_seq() { return seq; }
-  const char *get_type_name() const { return "mdsbeacon"; }
+  const char *get_type_name() const override { return "mdsbeacon"; }
   mds_rank_t get_standby_for_rank() { return standby_for_rank; }
   const string& get_standby_for_name() { return standby_for_name; }
   const fs_cluster_id_t& get_standby_for_fscid() { return standby_for_fscid; }
@@ -192,12 +192,12 @@ public:
   const map<string, string>& get_sys_info() const { return sys_info; }
   void set_sys_info(const map<string, string>& i) { sys_info = i; }
 
-  void print(ostream& out) const {
+  void print(ostream& out) const override {
     out << "mdsbeacon(" << global_id << "/" << name << " " << ceph_mds_state_name(state) 
 	<< " seq " << seq << " v" << version << ")";
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     paxos_encode();
     ::encode(fsid, payload);
     ::encode(global_id, payload);
@@ -215,7 +215,7 @@ public:
     ::encode(standby_for_fscid, payload);
     ::encode(standby_replay, payload);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     paxos_decode(p);
     ::decode(fsid, p);
diff --git a/src/messages/MMDSCacheRejoin.h b/src/messages/MMDSCacheRejoin.h
index 641b207b4ce..4b6f44cd81d 100644
--- a/src/messages/MMDSCacheRejoin.h
+++ b/src/messages/MMDSCacheRejoin.h
@@ -203,11 +203,11 @@ class MMDSCacheRejoin : public Message {
     Message(MSG_MDS_CACHEREJOIN, HEAD_VERSION, COMPAT_VERSION),
     op(o) {}
 private:
-  ~MMDSCacheRejoin() {}
+  ~MMDSCacheRejoin() override {}
 
 public:
-  const char *get_type_name() const { return "cache_rejoin"; }
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "cache_rejoin"; }
+  void print(ostream& out) const override {
     out << "cache_rejoin " << get_opname(op);
   }
 
@@ -285,7 +285,7 @@ public:
   }
 
   // -- encoding --
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(op, payload);
     ::encode(strong_inodes, payload);
     ::encode(inode_base, payload);
@@ -307,7 +307,7 @@ public:
     ::encode(authpinned_dentries, payload);
     ::encode(xlocked_dentries, payload);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(op, p);
     ::decode(strong_inodes, p);
diff --git a/src/messages/MMDSFindIno.h b/src/messages/MMDSFindIno.h
index 859a7c405f1..2d94bd835c7 100644
--- a/src/messages/MMDSFindIno.h
+++ b/src/messages/MMDSFindIno.h
@@ -25,16 +25,16 @@ struct MMDSFindIno : public Message {
   MMDSFindIno() : Message(MSG_MDS_FINDINO) {}
   MMDSFindIno(ceph_tid_t t, inodeno_t i) : Message(MSG_MDS_FINDINO), tid(t), ino(i) {}
 
-  const char *get_type_name() const { return "findino"; }
-  void print(ostream &out) const {
+  const char *get_type_name() const override { return "findino"; }
+  void print(ostream &out) const override {
     out << "findino(" << tid << " " << ino << ")";
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(tid, payload);
     ::encode(ino, payload);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(tid, p);
     ::decode(ino, p);
diff --git a/src/messages/MMDSFindInoReply.h b/src/messages/MMDSFindInoReply.h
index aaf2a6e7446..82523ca82c8 100644
--- a/src/messages/MMDSFindInoReply.h
+++ b/src/messages/MMDSFindInoReply.h
@@ -25,16 +25,16 @@ struct MMDSFindInoReply : public Message {
   MMDSFindInoReply() : Message(MSG_MDS_FINDINOREPLY) {}
   MMDSFindInoReply(ceph_tid_t t) : Message(MSG_MDS_FINDINOREPLY), tid(t) {}
 
-  const char *get_type_name() const { return "findinoreply"; }
-  void print(ostream &out) const {
+  const char *get_type_name() const override { return "findinoreply"; }
+  void print(ostream &out) const override {
     out << "findinoreply(" << tid << " " << path << ")";
   }
   
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(tid, payload);
     ::encode(path, payload);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(tid, p);
     ::decode(path, p);
diff --git a/src/messages/MMDSFragmentNotify.h b/src/messages/MMDSFragmentNotify.h
index d95751e3481..5568b37c0fa 100644
--- a/src/messages/MMDSFragmentNotify.h
+++ b/src/messages/MMDSFragmentNotify.h
@@ -34,22 +34,22 @@ class MMDSFragmentNotify : public Message {
 	Message(MSG_MDS_FRAGMENTNOTIFY),
     ino(df.ino), basefrag(df.frag), bits(b) { }
 private:
-  ~MMDSFragmentNotify() {}
+  ~MMDSFragmentNotify() override {}
 
 public:  
-  const char *get_type_name() const { return "fragment_notify"; }
-  void print(ostream& o) const {
+  const char *get_type_name() const override { return "fragment_notify"; }
+  void print(ostream& o) const override {
     o << "fragment_notify(" << ino << "." << basefrag
       << " " << (int)bits << ")";
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(ino, payload);
     ::encode(basefrag, payload);
     ::encode(bits, payload);
     ::encode(basebl, payload);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(ino, p);
     ::decode(basefrag, p);
diff --git a/src/messages/MMDSLoadTargets.h b/src/messages/MMDSLoadTargets.h
index d559581a106..9fc93525945 100644
--- a/src/messages/MMDSLoadTargets.h
+++ b/src/messages/MMDSLoadTargets.h
@@ -33,22 +33,22 @@ class MMDSLoadTargets : public PaxosServiceMessage {
     PaxosServiceMessage(MSG_MDS_OFFLOAD_TARGETS, 0),
     global_id(g), targets(mds_targets) {}
 private:
-  ~MMDSLoadTargets() {}
+  ~MMDSLoadTargets() override {}
 
 public:
-  const char* get_type_name() const { return "mds_load_targets"; }
-  void print(ostream& o) const {
+  const char* get_type_name() const override { return "mds_load_targets"; }
+  void print(ostream& o) const override {
     o << "mds_load_targets(" << global_id << " " << targets << ")";
   }
 
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     paxos_decode(p);
     ::decode(global_id, p);
     ::decode(targets, p);
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     paxos_encode();
     ::encode(global_id, payload);
     ::encode(targets, payload);
diff --git a/src/messages/MMDSMap.h b/src/messages/MMDSMap.h
index 99474822884..92b4e1cafd9 100644
--- a/src/messages/MMDSMap.h
+++ b/src/messages/MMDSMap.h
@@ -41,22 +41,22 @@ public:
     mm->encode(encoded, -1);  // we will reencode with fewer features as necessary
   }
 private:
-  ~MMDSMap() {}
+  ~MMDSMap() override {}
 
 public:
-  const char *get_type_name() const { return "mdsmap"; }
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "mdsmap"; }
+  void print(ostream& out) const override {
     out << "mdsmap(e " << epoch << ")";
   }
 
   // marshalling
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(fsid, p);
     ::decode(epoch, p);
     ::decode(encoded, p);
   }
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(fsid, payload);
     ::encode(epoch, payload);
     if ((features & CEPH_FEATURE_PGID64) == 0 ||
diff --git a/src/messages/MMDSOpenIno.h b/src/messages/MMDSOpenIno.h
index a169fd0e79d..b98f023fa7b 100644
--- a/src/messages/MMDSOpenIno.h
+++ b/src/messages/MMDSOpenIno.h
@@ -27,16 +27,16 @@ struct MMDSOpenIno : public Message {
     header.tid = t;
   }
 
-  const char *get_type_name() const { return "openino"; }
-  void print(ostream &out) const {
+  const char *get_type_name() const override { return "openino"; }
+  void print(ostream &out) const override {
     out << "openino(" << header.tid << " " << ino << " " << ancestors << ")";
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(ino, payload);
     ::encode(ancestors, payload);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(ino, p);
     ::decode(ancestors, p);
diff --git a/src/messages/MMDSOpenInoReply.h b/src/messages/MMDSOpenInoReply.h
index 76cc55ce9f8..0b80c0d0645 100644
--- a/src/messages/MMDSOpenInoReply.h
+++ b/src/messages/MMDSOpenInoReply.h
@@ -29,19 +29,19 @@ struct MMDSOpenInoReply : public Message {
     header.tid = t;
   }
 
-  const char *get_type_name() const { return "openinoreply"; }
-  void print(ostream &out) const {
+  const char *get_type_name() const override { return "openinoreply"; }
+  void print(ostream &out) const override {
     out << "openinoreply(" << header.tid << " "
 	<< ino << " " << hint << " " << ancestors << ")";
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(ino, payload);
     ::encode(ancestors, payload);
     ::encode(hint, payload);
     ::encode(error, payload);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(ino, p);
     ::decode(ancestors, p);
diff --git a/src/messages/MMDSResolve.h b/src/messages/MMDSResolve.h
index 4f57c0c44c9..6e9f0285297 100644
--- a/src/messages/MMDSResolve.h
+++ b/src/messages/MMDSResolve.h
@@ -43,12 +43,12 @@ public:
 
   MMDSResolve() : Message(MSG_MDS_RESOLVE) {}
 private:
-  ~MMDSResolve() {}
+  ~MMDSResolve() override {}
 
 public:
-  const char *get_type_name() const { return "mds_resolve"; }
+  const char *get_type_name() const override { return "mds_resolve"; }
 
-  void print(ostream& out) const {
+  void print(ostream& out) const override {
     out << "mds_resolve(" << subtrees.size()
 	<< "+" << ambiguous_imports.size()
 	<< " subtrees +" << slave_requests.size() << " slave requests)";
@@ -73,12 +73,12 @@ public:
     slave_requests[reqid].inode_caps.claim(bl);
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(subtrees, payload);
     ::encode(ambiguous_imports, payload);
     ::encode(slave_requests, payload);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(subtrees, p);
     ::decode(ambiguous_imports, p);
diff --git a/src/messages/MMDSResolveAck.h b/src/messages/MMDSResolveAck.h
index 743353fef95..98101fb70d7 100644
--- a/src/messages/MMDSResolveAck.h
+++ b/src/messages/MMDSResolveAck.h
@@ -27,10 +27,10 @@ class MMDSResolveAck : public Message {
 
   MMDSResolveAck() : Message(MSG_MDS_RESOLVEACK) {}
 private:
-  ~MMDSResolveAck() {}
+  ~MMDSResolveAck() override {}
 
 public:
-  const char *get_type_name() const { return "resolve_ack"; }
+  const char *get_type_name() const override { return "resolve_ack"; }
   /*void print(ostream& out) const {
     out << "resolve_ack.size()
 	<< "+" << ambiguous_imap.size()
@@ -45,11 +45,11 @@ public:
     abort.push_back(r);
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(commit, payload);
     ::encode(abort, payload);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(commit, p);
     ::decode(abort, p);
diff --git a/src/messages/MMDSSlaveRequest.h b/src/messages/MMDSSlaveRequest.h
index e708a4ef7d9..5512c5a0721 100644
--- a/src/messages/MMDSSlaveRequest.h
+++ b/src/messages/MMDSSlaveRequest.h
@@ -153,10 +153,10 @@ public:
     reqid(ri), attempt(att), op(o), flags(0), lock_type(0),
     inode_export_v(0) { }
 private:
-  ~MMDSSlaveRequest() {}
+  ~MMDSSlaveRequest() override {}
 
 public:
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(reqid, payload);
     ::encode(attempt, payload);
     ::encode(op, payload);
@@ -173,7 +173,7 @@ public:
     ::encode(srci_replica, payload);
     ::encode(stray, payload);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(reqid, p);
     ::decode(attempt, p);
@@ -192,8 +192,8 @@ public:
     ::decode(stray, p);
   }
 
-  const char *get_type_name() const { return "slave_request"; }
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "slave_request"; }
+  void print(ostream& out) const override {
     out << "slave_request(" << reqid
 	<< "." << attempt
 	<< " " << get_opname(op) 
diff --git a/src/messages/MMDSTableRequest.h b/src/messages/MMDSTableRequest.h
index e67c1f3ef2d..65489cd7dc9 100644
--- a/src/messages/MMDSTableRequest.h
+++ b/src/messages/MMDSTableRequest.h
@@ -33,11 +33,11 @@ class MMDSTableRequest : public Message {
     set_tid(v);
   }
 private:
-  ~MMDSTableRequest() {}
+  ~MMDSTableRequest() override {}
 
 public:  
-  virtual const char *get_type_name() const { return "mds_table_request"; }
-  void print(ostream& o) const {
+  const char *get_type_name() const override { return "mds_table_request"; }
+  void print(ostream& o) const override {
     o << "mds_table_request(" << get_mdstable_name(table)
       << " " << get_mdstableserver_opname(op);
     if (reqid) o << " " << reqid;
@@ -46,7 +46,7 @@ public:
     o << ")";
   }
 
-  virtual void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(table, p);
     ::decode(op, p);
@@ -54,7 +54,7 @@ public:
     ::decode(bl, p);
   }
 
-  virtual void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(table, payload);
     ::encode(op, payload);
     ::encode(reqid, payload);
diff --git a/src/messages/MMgrBeacon.h b/src/messages/MMgrBeacon.h
index b452a9dda77..a07ba97f8f6 100644
--- a/src/messages/MMgrBeacon.h
+++ b/src/messages/MMgrBeacon.h
@@ -51,25 +51,25 @@ public:
   const std::string& get_name() const { return name; }
 
 private:
-  ~MMgrBeacon() {}
+  ~MMgrBeacon() override {}
 
 public:
 
-  const char *get_type_name() const { return "mgrbeacon"; }
+  const char *get_type_name() const override { return "mgrbeacon"; }
 
-  void print(ostream& out) const {
+  void print(ostream& out) const override {
     out << get_type_name() << " mgr." << name << "(" << gid << ", "
         << server_addr << ", " << available << ")";
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     paxos_encode();
     ::encode(server_addr, payload, features);
     ::encode(gid, payload);
     ::encode(available, payload);
     ::encode(name, payload);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     paxos_decode(p);
     ::decode(server_addr, p);
diff --git a/src/messages/MMgrConfigure.h b/src/messages/MMgrConfigure.h
index e9b7439a9fa..27c7cbca491 100644
--- a/src/messages/MMgrConfigure.h
+++ b/src/messages/MMgrConfigure.h
@@ -29,18 +29,18 @@ class MMgrConfigure : public Message
 public:
   uint32_t stats_period;
 
-  void decode_payload()
+  void decode_payload() override
   {
     bufferlist::iterator p = payload.begin();
     ::decode(stats_period, p);
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(stats_period, payload);
   }
 
-  const char *get_type_name() const { return "mgrconfigure"; }
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "mgrconfigure"; }
+  void print(ostream& out) const override {
     out << get_type_name() << "()";
   }
 
diff --git a/src/messages/MMgrDigest.h b/src/messages/MMgrDigest.h
index 3823a1d50ee..a8e5289d27d 100644
--- a/src/messages/MMgrDigest.h
+++ b/src/messages/MMgrDigest.h
@@ -30,23 +30,23 @@ public:
   MMgrDigest() : 
     Message(MSG_MGR_DIGEST) {}
 
-  const char *get_type_name() const { return "mgrdigest"; }
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "mgrdigest"; }
+  void print(ostream& out) const override {
     out << get_type_name();
   }
 
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(mon_status_json, p);
     ::decode(health_json, p);
   }
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(mon_status_json, payload);
     ::encode(health_json, payload);
   }
 
 private:
-  ~MMgrDigest() {}
+  ~MMgrDigest() override {}
 
 };
 
diff --git a/src/messages/MMgrMap.h b/src/messages/MMgrMap.h
index 00dfcb8168c..ddaa96a3a51 100644
--- a/src/messages/MMgrMap.h
+++ b/src/messages/MMgrMap.h
@@ -34,19 +34,19 @@ public:
   }
 
 private:
-  ~MMgrMap() {}
+  ~MMgrMap() override {}
 
 public:
-  const char *get_type_name() const { return "mgrmap"; }
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "mgrmap"; }
+  void print(ostream& out) const override {
     out << get_type_name() << "(e " << map.epoch << ")";
   }
 
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(map, p);
   }
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(map, payload, features);
   }
 };
diff --git a/src/messages/MMgrOpen.h b/src/messages/MMgrOpen.h
index 2fdfa055b78..13c67586b99 100644
--- a/src/messages/MMgrOpen.h
+++ b/src/messages/MMgrOpen.h
@@ -26,18 +26,18 @@ public:
 
   std::string daemon_name;
 
-  void decode_payload()
+  void decode_payload() override
   {
     bufferlist::iterator p = payload.begin();
     ::decode(daemon_name, p);
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(daemon_name, payload);
   }
 
-  const char *get_type_name() const { return "mgropen"; }
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "mgropen"; }
+  void print(ostream& out) const override {
     out << get_type_name() << "(" << daemon_name << ")"; 
   }
 
diff --git a/src/messages/MMgrReport.h b/src/messages/MMgrReport.h
index 21eb7c6acdb..825cb830858 100644
--- a/src/messages/MMgrReport.h
+++ b/src/messages/MMgrReport.h
@@ -76,7 +76,7 @@ public:
 
   std::string daemon_name;
 
-  void decode_payload()
+  void decode_payload() override
   {
     bufferlist::iterator p = payload.begin();
     ::decode(daemon_name, p);
@@ -84,14 +84,14 @@ public:
     ::decode(packed, p);
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(daemon_name, payload);
     ::encode(declare_types, payload);
     ::encode(packed, payload);
   }
 
-  const char *get_type_name() const { return "mgrreport"; }
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "mgrreport"; }
+  void print(ostream& out) const override {
     out << get_type_name() << "(" << declare_types.size() << " "
         << packed.length() << ")"; 
   }
diff --git a/src/messages/MMonCommand.h b/src/messages/MMonCommand.h
index 2b79465cfbd..c6764475dcd 100644
--- a/src/messages/MMonCommand.h
+++ b/src/messages/MMonCommand.h
@@ -32,11 +32,11 @@ class MMonCommand : public PaxosServiceMessage {
   { }
 
 private:
-  ~MMonCommand() {}
+  ~MMonCommand() override {}
 
 public:  
-  const char *get_type_name() const { return "mon_command"; }
-  void print(ostream& o) const {
+  const char *get_type_name() const override { return "mon_command"; }
+  void print(ostream& o) const override {
     o << "mon_command(";
     for (unsigned i=0; i<cmd.size(); i++) {
       if (i) o << ' ';
@@ -45,12 +45,12 @@ public:
     o << " v " << version << ")";
   }
   
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     paxos_encode();
     ::encode(fsid, payload);
     ::encode(cmd, payload);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     paxos_decode(p);
     ::decode(fsid, p);
diff --git a/src/messages/MMonCommandAck.h b/src/messages/MMonCommandAck.h
index 5ebecde30c7..2c07b5fe722 100644
--- a/src/messages/MMonCommandAck.h
+++ b/src/messages/MMonCommandAck.h
@@ -28,21 +28,21 @@ class MMonCommandAck : public PaxosServiceMessage {
     PaxosServiceMessage(MSG_MON_COMMAND_ACK, v),
     cmd(c), r(_r), rs(s) { }
 private:
-  ~MMonCommandAck() {}
+  ~MMonCommandAck() override {}
 
 public:
-  const char *get_type_name() const { return "mon_command"; }
-  void print(ostream& o) const {
+  const char *get_type_name() const override { return "mon_command"; }
+  void print(ostream& o) const override {
     o << "mon_command_ack(" << cmd << "=" << r << " " << rs << " v" << version << ")";
   }
   
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     paxos_encode();
     ::encode(r, payload);
     ::encode(rs, payload);
     ::encode(cmd, payload);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     paxos_decode(p);
     ::decode(r, p);
diff --git a/src/messages/MMonElection.h b/src/messages/MMonElection.h
index 97ab440d6fd..89f10a81a2b 100644
--- a/src/messages/MMonElection.h
+++ b/src/messages/MMonElection.h
@@ -73,15 +73,15 @@ public:
     m->encode(monmap_bl, CEPH_FEATURES_ALL);
   }
 private:
-  ~MMonElection() {}
+  ~MMonElection() override {}
 
 public:  
-  const char *get_type_name() const { return "election"; }
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "election"; }
+  void print(ostream& out) const override {
     out << "election(" << fsid << " " << get_opname(op) << " " << epoch << ")";
   }
   
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     if (monmap_bl.length() && (features != CEPH_FEATURES_ALL)) {
       // reencode old-format monmap
       MonMap t;
@@ -101,7 +101,7 @@ public:
     ::encode(sharing_bl, payload);
     ::encode(mon_features, payload);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     if (header.version >= 2)
       ::decode(fsid, p);
diff --git a/src/messages/MMonGetMap.h b/src/messages/MMonGetMap.h
index d4bb61e751d..45682d1dd00 100644
--- a/src/messages/MMonGetMap.h
+++ b/src/messages/MMonGetMap.h
@@ -23,13 +23,13 @@ class MMonGetMap : public Message {
  public:
   MMonGetMap() : Message(CEPH_MSG_MON_GET_MAP) { }
 private:
-  ~MMonGetMap() {}
+  ~MMonGetMap() override {}
 
 public:
-  const char *get_type_name() const { return "mon_getmap"; }
+  const char *get_type_name() const override { return "mon_getmap"; }
   
-  void encode_payload(uint64_t features) { }
-  void decode_payload() { }
+  void encode_payload(uint64_t features) override { }
+  void decode_payload() override { }
 };
 
 #endif
diff --git a/src/messages/MMonGetOSDMap.h b/src/messages/MMonGetOSDMap.h
index 859d253f631..de10c7a87f8 100644
--- a/src/messages/MMonGetOSDMap.h
+++ b/src/messages/MMonGetOSDMap.h
@@ -31,7 +31,7 @@ public:
       inc_first(0),
       inc_last(0) { }
 private:
-  ~MMonGetOSDMap() {}
+  ~MMonGetOSDMap() override {}
 
 public:
   void request_full(epoch_t first, epoch_t last) {
@@ -57,8 +57,8 @@ public:
     return inc_last;
   }
 
-  const char *get_type_name() const { return "mon_get_osdmap"; }
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "mon_get_osdmap"; }
+  void print(ostream& out) const override {
     out << "mon_get_osdmap(";
     if (full_first && full_last)
       out << "full " << full_first << "-" << full_last;
@@ -67,14 +67,14 @@ public:
     out << ")";
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     paxos_encode();
     ::encode(full_first, payload);
     ::encode(full_last, payload);
     ::encode(inc_first, payload);
     ::encode(inc_last, payload);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     paxos_decode(p);
     ::decode(full_first, p);
diff --git a/src/messages/MMonGetVersion.h b/src/messages/MMonGetVersion.h
index e74daa6519c..6c5367e13ee 100644
--- a/src/messages/MMonGetVersion.h
+++ b/src/messages/MMonGetVersion.h
@@ -29,20 +29,20 @@ class MMonGetVersion : public Message {
 public:
   MMonGetVersion() : Message(CEPH_MSG_MON_GET_VERSION) {}
 
-  const char *get_type_name() const {
+  const char *get_type_name() const override {
     return "mon_get_version";
   }
 
-  void print(ostream& o) const {
+  void print(ostream& o) const override {
     o << "mon_get_version(what=" << what << " handle=" << handle << ")";
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(handle, payload);
     ::encode(what, payload);
   }
 
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(handle, p);
     ::decode(what, p);
@@ -52,7 +52,7 @@ public:
   string what;
 
 private:
-  ~MMonGetVersion() {}
+  ~MMonGetVersion() override {}
 };
 
 #endif
diff --git a/src/messages/MMonGetVersionReply.h b/src/messages/MMonGetVersionReply.h
index 5b052764793..55dcd204915 100644
--- a/src/messages/MMonGetVersionReply.h
+++ b/src/messages/MMonGetVersionReply.h
@@ -31,21 +31,21 @@ class MMonGetVersionReply : public Message {
 public:
   MMonGetVersionReply() : Message(CEPH_MSG_MON_GET_VERSION_REPLY, HEAD_VERSION) { }
 
-  const char *get_type_name() const {
+  const char *get_type_name() const override {
     return "mon_get_version_reply";
   }
 
-  void print(ostream& o) const {
+  void print(ostream& o) const override {
     o << "mon_get_version_reply(handle=" << handle << " version=" << version << ")";
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(handle, payload);
     ::encode(version, payload);
     ::encode(oldest_version, payload);
   }
 
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(handle, p);
     ::decode(version, p);
@@ -58,7 +58,7 @@ public:
   version_t oldest_version;
 
 private:
-  ~MMonGetVersionReply() {}
+  ~MMonGetVersionReply() override {}
 };
 
 #endif
diff --git a/src/messages/MMonGlobalID.h b/src/messages/MMonGlobalID.h
index 7ec1acc9ad7..99f466dc4a3 100644
--- a/src/messages/MMonGlobalID.h
+++ b/src/messages/MMonGlobalID.h
@@ -21,20 +21,20 @@ struct MMonGlobalID : public PaxosServiceMessage {
   uint64_t old_max_id;
   MMonGlobalID() : PaxosServiceMessage(MSG_MON_GLOBAL_ID, 0), old_max_id(0) { }
 private:
-  ~MMonGlobalID() {}
+  ~MMonGlobalID() override {}
 
 public:
-  const char *get_type_name() const { return "global_id"; }
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "global_id"; }
+  void print(ostream& out) const override {
     out << "global_id  (" << old_max_id << ")";
   }
 
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     paxos_decode(p);
     ::decode(old_max_id, p);
   }
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     paxos_encode();
     ::encode(old_max_id, payload);
   }
diff --git a/src/messages/MMonHealth.h b/src/messages/MMonHealth.h
index 9608647f242..aecdf00800d 100644
--- a/src/messages/MMonHealth.h
+++ b/src/messages/MMonHealth.h
@@ -40,17 +40,17 @@ struct MMonHealth : public MMonQuorumService
   { }
 
 private:
-  ~MMonHealth() { }
+  ~MMonHealth() override { }
 
 public:
-  const char *get_type_name() const { return "mon_health"; }
+  const char *get_type_name() const override { return "mon_health"; }
   const char *get_service_op_name() const {
     switch (service_op) {
     case OP_TELL: return "tell";
     }
     return "???";
   }
-  void print(ostream &o) const {
+  void print(ostream &o) const override {
     o << "mon_health( service " << get_service_type()
       << " op " << get_service_op_name()
       << " e " << get_epoch() << " r " << get_round()
@@ -65,7 +65,7 @@ public:
     return service_op;
   }
 
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     service_decode(p);
     ::decode(service_type, p);
@@ -73,7 +73,7 @@ public:
     ::decode(data_stats, p);
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     service_encode();
     ::encode(service_type, payload);
     ::encode(service_op, payload);
diff --git a/src/messages/MMonJoin.h b/src/messages/MMonJoin.h
index e619c423a74..9f9331a7cd3 100644
--- a/src/messages/MMonJoin.h
+++ b/src/messages/MMonJoin.h
@@ -33,21 +33,21 @@ class MMonJoin : public PaxosServiceMessage {
   { }
   
 private:
-  ~MMonJoin() {}
+  ~MMonJoin() override {}
 
 public:  
-  const char *get_type_name() const { return "mon_join"; }
-  void print(ostream& o) const {
+  const char *get_type_name() const override { return "mon_join"; }
+  void print(ostream& o) const override {
     o << "mon_join(" << name << " " << addr << ")";
   }
   
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     paxos_encode();
     ::encode(fsid, payload);
     ::encode(name, payload);
     ::encode(addr, payload, features);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     paxos_decode(p);
     ::decode(fsid, p);
diff --git a/src/messages/MMonMap.h b/src/messages/MMonMap.h
index 63c8480fa4a..831b1a1fbb1 100644
--- a/src/messages/MMonMap.h
+++ b/src/messages/MMonMap.h
@@ -28,12 +28,12 @@ public:
     monmapbl.claim(bl);
   }
 private:
-  ~MMonMap() {}
+  ~MMonMap() override {}
 
 public:
-  const char *get_type_name() const { return "mon_map"; }
+  const char *get_type_name() const override { return "mon_map"; }
 
-  void encode_payload(uint64_t features) { 
+  void encode_payload(uint64_t features) override { 
     if (monmapbl.length() &&
 	((features & CEPH_FEATURE_MONENC) == 0 ||
 	 (features & CEPH_FEATURE_MSG_ADDR2) == 0)) {
@@ -46,7 +46,7 @@ public:
 
     ::encode(monmapbl, payload);
   }
-  void decode_payload() { 
+  void decode_payload() override { 
     bufferlist::iterator p = payload.begin();
     ::decode(monmapbl, p);
   }
diff --git a/src/messages/MMonMetadata.h b/src/messages/MMonMetadata.h
index ae56611517c..3b084d92e99 100644
--- a/src/messages/MMonMetadata.h
+++ b/src/messages/MMonMetadata.h
@@ -24,7 +24,7 @@ public:
 
 private:
   static const int HEAD_VERSION = 1;
-  ~MMonMetadata() {}
+  ~MMonMetadata() override {}
 
 public:
   MMonMetadata() :
@@ -35,15 +35,15 @@ public:
     data(metadata)
   {}
 
-  virtual const char *get_type_name() const {
+  const char *get_type_name() const override {
     return "mon_metadata";
   }
 
-  virtual void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(data, payload);
   }
 
-  virtual void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(data, p);
   }
diff --git a/src/messages/MMonPaxos.h b/src/messages/MMonPaxos.h
index 8094701bed7..328fd6e3c3f 100644
--- a/src/messages/MMonPaxos.h
+++ b/src/messages/MMonPaxos.h
@@ -74,12 +74,12 @@ class MMonPaxos : public Message {
   }
 
 private:
-  ~MMonPaxos() {}
+  ~MMonPaxos() override {}
 
 public:  
-  const char *get_type_name() const { return "paxos"; }
+  const char *get_type_name() const override { return "paxos"; }
   
-  void print(ostream& out) const {
+  void print(ostream& out) const override {
     out << "paxos(" << get_opname(op) 
 	<< " lc " << last_committed
 	<< " fc " << first_committed
@@ -89,7 +89,7 @@ public:
     out <<  ")";
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     header.version = HEAD_VERSION;
     ::encode(epoch, payload);
     ::encode(op, payload);
@@ -104,7 +104,7 @@ public:
     ::encode(latest_value, payload);
     ::encode(values, payload);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(epoch, p);
     ::decode(op, p);
diff --git a/src/messages/MMonProbe.h b/src/messages/MMonProbe.h
index f9883cce1ef..91bf116b9dd 100644
--- a/src/messages/MMonProbe.h
+++ b/src/messages/MMonProbe.h
@@ -68,11 +68,11 @@ public:
       has_ever_joined(hej),
       required_features(0) {}
 private:
-  ~MMonProbe() {}
+  ~MMonProbe() override {}
 
 public:  
-  const char *get_type_name() const { return "mon_probe"; }
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "mon_probe"; }
+  void print(ostream& out) const override {
     out << "mon_probe(" << get_opname(op) << " " << fsid << " name " << name;
     if (quorum.size())
       out << " quorum " << quorum;
@@ -89,7 +89,7 @@ public:
     out << ")";
   }
   
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     if (monmap_bl.length() &&
 	((features & CEPH_FEATURE_MONENC) == 0 ||
 	 (features & CEPH_FEATURE_MSG_ADDR2) == 0)) {
@@ -110,7 +110,7 @@ public:
     ::encode(paxos_last_version, payload);
     ::encode(required_features, payload);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(fsid, p);
     ::decode(op, p);
diff --git a/src/messages/MMonQuorumService.h b/src/messages/MMonQuorumService.h
index 6a25ae1e203..ff77b468c74 100644
--- a/src/messages/MMonQuorumService.h
+++ b/src/messages/MMonQuorumService.h
@@ -28,7 +28,7 @@ struct MMonQuorumService : public Message
   { }
 
 protected:
-  ~MMonQuorumService() { }
+  ~MMonQuorumService() override { }
 
 public:
 
@@ -58,15 +58,15 @@ public:
     ::decode(round, p);
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     assert(0 == "MMonQuorumService message must always be a base class");
   }
 
-  void decode_payload() {
+  void decode_payload() override {
     assert(0 == "MMonQuorumService message must always be a base class");
   }
 
-  const char *get_type_name() const { return "quorum_service"; }
+  const char *get_type_name() const override { return "quorum_service"; }
 };
 
 #endif /* CEPH_MMON_QUORUM_SERVICE_H */
diff --git a/src/messages/MMonScrub.h b/src/messages/MMonScrub.h
index 9bfa61a70f8..2b9d8c9c172 100644
--- a/src/messages/MMonScrub.h
+++ b/src/messages/MMonScrub.h
@@ -51,9 +51,9 @@ public:
       op(op), version(v), num_keys(num_keys)
   { }
 
-  const char *get_type_name() const { return "mon_scrub"; }
+  const char *get_type_name() const override { return "mon_scrub"; }
 
-  void print(ostream& out) const {
+  void print(ostream& out) const override {
     out << "mon_scrub(" << get_opname((op_type_t)op);
     out << " v " << version;
     if (op == OP_RESULT)
@@ -63,7 +63,7 @@ public:
     out << ")";
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     uint8_t o = op;
     ::encode(o, payload);
     ::encode(version, payload);
@@ -72,7 +72,7 @@ public:
     ::encode(key, payload);
   }
 
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     uint8_t o;
     ::decode(o, p);
diff --git a/src/messages/MMonSubscribe.h b/src/messages/MMonSubscribe.h
index 2363775259c..1fee9bb379e 100644
--- a/src/messages/MMonSubscribe.h
+++ b/src/messages/MMonSubscribe.h
@@ -37,7 +37,7 @@ struct MMonSubscribe : public Message {
   
   MMonSubscribe() : Message(CEPH_MSG_MON_SUBSCRIBE, HEAD_VERSION) { }
 private:
-  ~MMonSubscribe() {}
+  ~MMonSubscribe() override {}
 
 public:  
   void sub_want(const char *w, version_t start, unsigned flags) {
@@ -45,12 +45,12 @@ public:
     what[w].flags = flags;
   }
 
-  const char *get_type_name() const { return "mon_subscribe"; }
-  void print(ostream& o) const {
+  const char *get_type_name() const override { return "mon_subscribe"; }
+  void print(ostream& o) const override {
     o << "mon_subscribe(" << what << ")";
   }
 
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     if (header.version < 2) {
       map<string, ceph_mon_subscribe_item_old> oldwhat;
@@ -71,7 +71,7 @@ public:
       ::decode(what, p);
     }
   }
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     if (features & CEPH_FEATURE_SUBSCRIBE2) {
       ::encode(what, payload);
       header.version = HEAD_VERSION;
diff --git a/src/messages/MMonSubscribeAck.h b/src/messages/MMonSubscribeAck.h
index a2a1cded768..148d90db75d 100644
--- a/src/messages/MMonSubscribeAck.h
+++ b/src/messages/MMonSubscribeAck.h
@@ -28,20 +28,20 @@ struct MMonSubscribeAck : public Message {
   MMonSubscribeAck(uuid_d& f, int i) : Message(CEPH_MSG_MON_SUBSCRIBE_ACK),
 				       interval(i), fsid(f) { }
 private:
-  ~MMonSubscribeAck() {}
+  ~MMonSubscribeAck() override {}
 
 public:
-  const char *get_type_name() const { return "mon_subscribe_ack"; }
-  void print(ostream& o) const {
+  const char *get_type_name() const override { return "mon_subscribe_ack"; }
+  void print(ostream& o) const override {
     o << "mon_subscribe_ack(" << interval << "s)";
   }
 
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(interval, p);
     ::decode(fsid, p);
   }
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(interval, payload);
     ::encode(fsid, payload);
   }
diff --git a/src/messages/MMonSync.h b/src/messages/MMonSync.h
index d524f6de17d..d816cd15c78 100644
--- a/src/messages/MMonSync.h
+++ b/src/messages/MMonSync.h
@@ -71,9 +71,9 @@ public:
       last_committed(0)
   { }
 
-  const char *get_type_name() const { return "mon_sync"; }
+  const char *get_type_name() const override { return "mon_sync"; }
 
-  void print(ostream& out) const {
+  void print(ostream& out) const override {
     out << "mon_sync(" << get_opname(op);
     if (cookie)
       out << " cookie " << cookie;
@@ -86,7 +86,7 @@ public:
     out << ")";
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(op, payload);
     ::encode(cookie, payload);
     ::encode(last_committed, payload);
@@ -96,7 +96,7 @@ public:
     ::encode(reply_to, payload, features);
   }
 
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(op, p);
     ::decode(cookie, p);
diff --git a/src/messages/MOSDAlive.h b/src/messages/MOSDAlive.h
index 12bbed351ac..aacffa932c1 100644
--- a/src/messages/MOSDAlive.h
+++ b/src/messages/MOSDAlive.h
@@ -26,21 +26,21 @@ class MOSDAlive : public PaxosServiceMessage {
   MOSDAlive(epoch_t h, epoch_t w) : PaxosServiceMessage(MSG_OSD_ALIVE, h), want(w) { }
   MOSDAlive() : PaxosServiceMessage(MSG_OSD_ALIVE, 0) {}
 private:
-  ~MOSDAlive() {}
+  ~MOSDAlive() override {}
 
 public:
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     paxos_encode();
     ::encode(want, payload);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     paxos_decode(p);
     ::decode(want, p);
   }
 
-  const char *get_type_name() const { return "osd_alive"; }
-  void print(ostream &out) const {
+  const char *get_type_name() const override { return "osd_alive"; }
+  void print(ostream &out) const override {
     out << "osd_alive(want up_thru " << want << " have " << version << ")";
   }
   
diff --git a/src/messages/MOSDBoot.h b/src/messages/MOSDBoot.h
index 74e6e0a844e..72f126ec0aa 100644
--- a/src/messages/MOSDBoot.h
+++ b/src/messages/MOSDBoot.h
@@ -52,17 +52,17 @@ class MOSDBoot : public PaxosServiceMessage {
   { }
   
 private:
-  ~MOSDBoot() { }
+  ~MOSDBoot() override { }
 
 public:
-  const char *get_type_name() const { return "osd_boot"; }
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "osd_boot"; }
+  void print(ostream& out) const override {
     out << "osd_boot(osd." << sb.whoami << " booted " << boot_epoch
 	<< " features " << osd_features
 	<< " v" << version << ")";
   }
   
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     paxos_encode();
     ::encode(sb, payload);
     ::encode(hb_back_addr, payload, features);
@@ -72,7 +72,7 @@ public:
     ::encode(metadata, payload);
     ::encode(osd_features, payload);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     paxos_decode(p);
     ::decode(sb, p);
diff --git a/src/messages/MOSDECSubOpRead.h b/src/messages/MOSDECSubOpRead.h
index 5199d32a27e..689685b74e6 100644
--- a/src/messages/MOSDECSubOpRead.h
+++ b/src/messages/MOSDECSubOpRead.h
@@ -27,7 +27,7 @@ public:
   epoch_t map_epoch;
   ECSubRead op;
 
-  int get_cost() const {
+  int get_cost() const override {
     return 0;
   }
   epoch_t get_map_epoch() const override {
@@ -41,22 +41,22 @@ public:
     : MOSDFastDispatchOp(MSG_OSD_EC_READ, HEAD_VERSION, COMPAT_VERSION)
     {}
 
-  virtual void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(pgid, p);
     ::decode(map_epoch, p);
     ::decode(op, p);
   }
 
-  virtual void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(pgid, payload);
     ::encode(map_epoch, payload);
     ::encode(op, payload, features);
   }
 
-  const char *get_type_name() const { return "MOSDECSubOpRead"; }
+  const char *get_type_name() const override { return "MOSDECSubOpRead"; }
 
-  void print(ostream& out) const {
+  void print(ostream& out) const override {
     out << "MOSDECSubOpRead(" << pgid
 	<< " " << map_epoch
 	<< " " << op;
diff --git a/src/messages/MOSDECSubOpReadReply.h b/src/messages/MOSDECSubOpReadReply.h
index 7d6512c8dd5..3903db68628 100644
--- a/src/messages/MOSDECSubOpReadReply.h
+++ b/src/messages/MOSDECSubOpReadReply.h
@@ -27,7 +27,7 @@ public:
   epoch_t map_epoch;
   ECSubReadReply op;
 
-  int get_cost() const {
+  int get_cost() const override {
     return 0;
   }
   epoch_t get_map_epoch() const override {
@@ -41,22 +41,22 @@ public:
     : MOSDFastDispatchOp(MSG_OSD_EC_READ_REPLY, HEAD_VERSION, COMPAT_VERSION)
     {}
 
-  virtual void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(pgid, p);
     ::decode(map_epoch, p);
     ::decode(op, p);
   }
 
-  virtual void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(pgid, payload);
     ::encode(map_epoch, payload);
     ::encode(op, payload);
   }
 
-  const char *get_type_name() const { return "MOSDECSubOpReadReply"; }
+  const char *get_type_name() const override { return "MOSDECSubOpReadReply"; }
 
-  void print(ostream& out) const {
+  void print(ostream& out) const override {
     out << "MOSDECSubOpReadReply(" << pgid
 	<< " " << map_epoch
 	<< " " << op;
diff --git a/src/messages/MOSDECSubOpWrite.h b/src/messages/MOSDECSubOpWrite.h
index 24b9a4e4120..679b7445843 100644
--- a/src/messages/MOSDECSubOpWrite.h
+++ b/src/messages/MOSDECSubOpWrite.h
@@ -27,7 +27,7 @@ public:
   epoch_t map_epoch;
   ECSubWrite op;
 
-  int get_cost() const {
+  int get_cost() const override {
     return 0;
   }
   epoch_t get_map_epoch() const override {
@@ -45,29 +45,29 @@ public:
     op.claim(in_op);
   }
 
-  virtual void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(pgid, p);
     ::decode(map_epoch, p);
     ::decode(op, p);
   }
 
-  virtual void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(pgid, payload);
     ::encode(map_epoch, payload);
     ::encode(op, payload);
   }
 
-  const char *get_type_name() const { return "MOSDECSubOpWrite"; }
+  const char *get_type_name() const override { return "MOSDECSubOpWrite"; }
 
-  void print(ostream& out) const {
+  void print(ostream& out) const override {
     out << "MOSDECSubOpWrite(" << pgid
 	<< " " << map_epoch
 	<< " " << op;
     out << ")";
   }
 
-  void clear_buffers() {
+  void clear_buffers() override {
     op.t = ObjectStore::Transaction();
     op.log_entries.clear();
   }
diff --git a/src/messages/MOSDECSubOpWriteReply.h b/src/messages/MOSDECSubOpWriteReply.h
index 4a811cdf7a5..dd653983ebf 100644
--- a/src/messages/MOSDECSubOpWriteReply.h
+++ b/src/messages/MOSDECSubOpWriteReply.h
@@ -27,7 +27,7 @@ public:
   epoch_t map_epoch;
   ECSubWriteReply op;
 
-  int get_cost() const {
+  int get_cost() const override {
     return 0;
   }
   epoch_t get_map_epoch() const override {
@@ -41,22 +41,22 @@ public:
     : MOSDFastDispatchOp(MSG_OSD_EC_WRITE_REPLY, HEAD_VERSION, COMPAT_VERSION)
     {}
 
-  virtual void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(pgid, p);
     ::decode(map_epoch, p);
     ::decode(op, p);
   }
 
-  virtual void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(pgid, payload);
     ::encode(map_epoch, payload);
     ::encode(op, payload);
   }
 
-  const char *get_type_name() const { return "MOSDECSubOpWriteReply"; }
+  const char *get_type_name() const override { return "MOSDECSubOpWriteReply"; }
 
-  void print(ostream& out) const {
+  void print(ostream& out) const override {
     out << "MOSDECSubOpWriteReply(" << pgid
 	<< " " << map_epoch
 	<< " " << op;
diff --git a/src/messages/MOSDFailure.h b/src/messages/MOSDFailure.h
index 7f0fb866861..9766522ef3e 100644
--- a/src/messages/MOSDFailure.h
+++ b/src/messages/MOSDFailure.h
@@ -49,7 +49,7 @@ class MOSDFailure : public PaxosServiceMessage {
       flags(extra_flags),
       epoch(e), failed_for(duration) { }
 private:
-  ~MOSDFailure() {}
+  ~MOSDFailure() override {}
 
 public: 
   entity_inst_t get_target() { return target_osd; }
@@ -61,7 +61,7 @@ public:
   }
   epoch_t get_epoch() const { return epoch; }
 
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     paxos_decode(p);
     ::decode(fsid, p);
@@ -77,7 +77,7 @@ public:
       failed_for = 0;
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     paxos_encode();
     ::encode(fsid, payload);
     ::encode(target_osd, payload, features);
@@ -86,8 +86,8 @@ public:
     ::encode(failed_for, payload);
   }
 
-  const char *get_type_name() const { return "osd_failure"; }
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "osd_failure"; }
+  void print(ostream& out) const override {
     out << "osd_failure("
 	<< (if_osd_failed() ? "failed " : "recovered ")
 	<< (is_immediate() ? "immediate " : "timeout ")
diff --git a/src/messages/MOSDMap.h b/src/messages/MOSDMap.h
index c426a22ed4c..b6aab1c5096 100644
--- a/src/messages/MOSDMap.h
+++ b/src/messages/MOSDMap.h
@@ -62,11 +62,11 @@ class MOSDMap : public Message {
       fsid(f),
       oldest_map(0), newest_map(0) { }
 private:
-  ~MOSDMap() {}
+  ~MOSDMap() override {}
 
 public:
   // marshalling
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(fsid, p);
     ::decode(incremental_maps, p);
@@ -79,7 +79,7 @@ public:
       newest_map = 0;
     }
   }
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     header.version = HEAD_VERSION;
     ::encode(fsid, payload);
     if ((features & CEPH_FEATURE_PGID64) == 0 ||
@@ -131,8 +131,8 @@ public:
     }
   }
 
-  const char *get_type_name() const { return "omap"; }
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "omap"; }
+  void print(ostream& out) const override {
     out << "osd_map(" << get_first() << ".." << get_last();
     if (oldest_map || newest_map)
       out << " src has " << oldest_map << ".." << newest_map;
diff --git a/src/messages/MOSDMarkMeDown.h b/src/messages/MOSDMarkMeDown.h
index 46df68bd959..d48f2367b86 100644
--- a/src/messages/MOSDMarkMeDown.h
+++ b/src/messages/MOSDMarkMeDown.h
@@ -37,13 +37,13 @@ class MOSDMarkMeDown : public PaxosServiceMessage {
 			  HEAD_VERSION, COMPAT_VERSION),
       fsid(fs), target_osd(f), epoch(e), request_ack(request_ack) {}
  private:
-  ~MOSDMarkMeDown() {}
+  ~MOSDMarkMeDown() override {}
 
 public: 
   entity_inst_t get_target() const { return target_osd; }
   epoch_t get_epoch() const { return epoch; }
 
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     paxos_decode(p);
     ::decode(fsid, p);
@@ -54,7 +54,7 @@ public:
       request_ack = true;    // assume true for older clients
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     paxos_encode();
     ::encode(fsid, payload);
     ::encode(target_osd, payload, features);
@@ -62,8 +62,8 @@ public:
     ::encode(request_ack, payload);
   }
 
-  const char *get_type_name() const { return "MOSDMarkMeDown"; }
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "MOSDMarkMeDown"; }
+  void print(ostream& out) const override {
     out << "MOSDMarkMeDown("
 	<< "request_ack=" << request_ack
 	<< ", target_osd=" << target_osd
diff --git a/src/messages/MOSDOp.h b/src/messages/MOSDOp.h
index b6797ac9d1b..4ca66396961 100755
--- a/src/messages/MOSDOp.h
+++ b/src/messages/MOSDOp.h
@@ -188,7 +188,7 @@ public:
     reqid.inc = inc;
   }
 private:
-  ~MOSDOp() {}
+  ~MOSDOp() override {}
 
 public:
   void set_mtime(utime_t mt) { mtime = mt; }
@@ -243,7 +243,7 @@ public:
   }
 
   // marshalling
-  virtual void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
 
     OSDOp::merge_osd_op_vector_in_data(ops, data);
 
@@ -380,7 +380,7 @@ struct ceph_osd_request_head {
     }
   }
 
-  virtual void decode_payload() {
+  void decode_payload() override {
     assert(partial_decode_needed && final_decode_needed);
     p = payload.begin();
 
@@ -553,12 +553,12 @@ struct ceph_osd_request_head {
     return true;
   }
 
-  void clear_buffers() {
+  void clear_buffers() override {
     ops.clear();
   }
 
-  const char *get_type_name() const { return "osd_op"; }
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "osd_op"; }
+  void print(ostream& out) const override {
     out << "osd_op(";
     if (!partial_decode_needed) {
       out << get_reqid() << ' ';
diff --git a/src/messages/MOSDOpReply.h b/src/messages/MOSDOpReply.h
index 49c62ed9ea2..115d83b9a29 100644
--- a/src/messages/MOSDOpReply.h
+++ b/src/messages/MOSDOpReply.h
@@ -150,10 +150,10 @@ public:
     }
   }
 private:
-  ~MOSDOpReply() {}
+  ~MOSDOpReply() override {}
 
 public:
-  virtual void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
 
     OSDOp::merge_osd_op_vector_out_data(ops, data);
 
@@ -206,7 +206,7 @@ public:
       }
     }
   }
-  virtual void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
 
     // Always keep here the newest version of decoding order/rule
@@ -297,9 +297,9 @@ public:
     }
   }
 
-  const char *get_type_name() const { return "osd_op_reply"; }
+  const char *get_type_name() const override { return "osd_op_reply"; }
   
-  void print(ostream& out) const {
+  void print(ostream& out) const override {
     out << "osd_op_reply(" << get_tid()
 	<< " " << oid << " " << ops
 	<< " v" << get_replay_version()
diff --git a/src/messages/MOSDPGBackfill.h b/src/messages/MOSDPGBackfill.h
index 3b099df5aad..bc001118db3 100644
--- a/src/messages/MOSDPGBackfill.h
+++ b/src/messages/MOSDPGBackfill.h
@@ -49,7 +49,7 @@ public:
     return pgid;
   }
 
-  virtual void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(op, p);
     ::decode(map_epoch, p);
@@ -76,7 +76,7 @@ public:
       pgid.shard = shard_id_t::NO_SHARD;
   }
 
-  virtual void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(op, payload);
     ::encode(map_epoch, payload);
     ::encode(query_epoch, payload);
@@ -101,11 +101,11 @@ public:
       pgid(p),
       compat_stat_sum(false) {}
 private:
-  ~MOSDPGBackfill() {}
+  ~MOSDPGBackfill() override {}
 
 public:
-  const char *get_type_name() const { return "pg_backfill"; }
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "pg_backfill"; }
+  void print(ostream& out) const override {
     out << "pg_backfill(" << get_op_name(op)
 	<< " " << pgid
 	<< " e " << map_epoch << "/" << query_epoch
diff --git a/src/messages/MOSDPGCreate.h b/src/messages/MOSDPGCreate.h
index c34f62a9009..e6f7aba8950 100644
--- a/src/messages/MOSDPGCreate.h
+++ b/src/messages/MOSDPGCreate.h
@@ -39,17 +39,17 @@ struct MOSDPGCreate : public Message {
     : Message(MSG_OSD_PG_CREATE, HEAD_VERSION, COMPAT_VERSION),
       epoch(e) { }
 private:
-  ~MOSDPGCreate() {}
+  ~MOSDPGCreate() override {}
 
 public:  
-  const char *get_type_name() const { return "pg_create"; }
+  const char *get_type_name() const override { return "pg_create"; }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(epoch, payload);
     ::encode(mkpg, payload);
     ::encode(ctimes, payload);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(epoch, p);
     if (header.version >= 2) {
@@ -80,7 +80,7 @@ public:
     }
   }
 
-  void print(ostream& out) const {
+  void print(ostream& out) const override {
     out << "osd_pg_create(e" << epoch;
     for (map<pg_t,pg_create_t>::const_iterator i = mkpg.begin();
          i != mkpg.end();
diff --git a/src/messages/MOSDPGInfo.h b/src/messages/MOSDPGInfo.h
index 0a82317658b..b78dd57a46b 100644
--- a/src/messages/MOSDPGInfo.h
+++ b/src/messages/MOSDPGInfo.h
@@ -40,11 +40,11 @@ public:
     set_priority(CEPH_MSG_PRIO_HIGH);
   }
 private:
-  ~MOSDPGInfo() {}
+  ~MOSDPGInfo() override {}
 
 public:
-  const char *get_type_name() const { return "pg_info"; }
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "pg_info"; }
+  void print(ostream& out) const override {
     out << "pg_info(" << pg_list.size() << " pgs e" << epoch << ":";
 
     for (vector<pair<pg_notify_t,pg_interval_map_t> >::const_iterator i = pg_list.begin();
@@ -60,7 +60,7 @@ public:
     out << ")";
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(epoch, payload);
 
     // v1 was vector<pg_info_t>
@@ -92,7 +92,7 @@ public:
       ::encode(p->first.to, payload);
     }
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(epoch, p);
 
diff --git a/src/messages/MOSDPGLog.h b/src/messages/MOSDPGLog.h
index 6dafb789cd3..62d4b204213 100644
--- a/src/messages/MOSDPGLog.h
+++ b/src/messages/MOSDPGLog.h
@@ -62,11 +62,11 @@ public:
   }
 
 private:
-  ~MOSDPGLog() {}
+  ~MOSDPGLog() override {}
 
 public:
-  const char *get_type_name() const { return "PGlog"; }
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "PGlog"; }
+  void print(ostream& out) const override {
     // NOTE: log is not const, but operator<< doesn't touch fields
     // swapped out by OSD code.
     out << "pg_log(" << info.pgid << " epoch " << epoch
@@ -74,7 +74,7 @@ public:
 	<< " query_epoch " << query_epoch << ")";
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(epoch, payload);
     ::encode(info, payload);
     ::encode(log, payload);
@@ -84,7 +84,7 @@ public:
     ::encode(to, payload);
     ::encode(from, payload);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(epoch, p);
     ::decode(info, p);
diff --git a/src/messages/MOSDPGNotify.h b/src/messages/MOSDPGNotify.h
index 5c92f590d0e..ae725f2b542 100644
--- a/src/messages/MOSDPGNotify.h
+++ b/src/messages/MOSDPGNotify.h
@@ -52,12 +52,12 @@ class MOSDPGNotify : public Message {
     set_priority(CEPH_MSG_PRIO_HIGH);
   }
 private:
-  ~MOSDPGNotify() {}
+  ~MOSDPGNotify() override {}
 
 public:  
-  const char *get_type_name() const { return "PGnot"; }
+  const char *get_type_name() const override { return "PGnot"; }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     // Use query_epoch for first entry for backwards compatibility
     epoch_t query_epoch = epoch;
     if (pg_list.size())
@@ -97,7 +97,7 @@ public:
       ::encode(p->first.to, payload);
     }
   }
-  void decode_payload() {
+  void decode_payload() override {
     epoch_t query_epoch;
     bufferlist::iterator p = payload.begin();
     ::decode(epoch, p);
@@ -144,7 +144,7 @@ public:
       }
     }
   }
-  void print(ostream& out) const {
+  void print(ostream& out) const override {
     out << "pg_notify(";
     for (vector<pair<pg_notify_t,pg_interval_map_t> >::const_iterator i = pg_list.begin();
          i != pg_list.end();
diff --git a/src/messages/MOSDPGPull.h b/src/messages/MOSDPGPull.h
index 4a39b13875c..df9c110f32f 100644
--- a/src/messages/MOSDPGPull.h
+++ b/src/messages/MOSDPGPull.h
@@ -57,11 +57,11 @@ public:
     }
   }
 
-  int get_cost() const {
+  int get_cost() const override {
     return cost;
   }
 
-  virtual void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(pgid.pgid, p);
     ::decode(map_epoch, p);
@@ -76,7 +76,7 @@ public:
     }
   }
 
-  virtual void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(pgid.pgid, payload);
     ::encode(map_epoch, payload);
     ::encode(pulls, payload, features);
@@ -85,9 +85,9 @@ public:
     ::encode(from, payload);
   }
 
-  const char *get_type_name() const { return "MOSDPGPull"; }
+  const char *get_type_name() const override { return "MOSDPGPull"; }
 
-  void print(ostream& out) const {
+  void print(ostream& out) const override {
     out << "MOSDPGPull(" << pgid
 	<< " e" << map_epoch
 	<< " cost " << cost
diff --git a/src/messages/MOSDPGPush.h b/src/messages/MOSDPGPush.h
index b463b8ba00b..9842ef06945 100644
--- a/src/messages/MOSDPGPush.h
+++ b/src/messages/MOSDPGPush.h
@@ -41,7 +41,7 @@ public:
     }
   }
 
-  int get_cost() const {
+  int get_cost() const override {
     return cost;
   }
 
@@ -61,7 +61,7 @@ public:
       cost(0)
     {}
 
-  virtual void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(pgid.pgid, p);
     ::decode(map_epoch, p);
@@ -76,7 +76,7 @@ public:
     }
   }
 
-  virtual void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(pgid.pgid, payload);
     ::encode(map_epoch, payload);
     ::encode(pushes, payload, features);
@@ -85,9 +85,9 @@ public:
     ::encode(from, payload);
   }
 
-  const char *get_type_name() const { return "MOSDPGPush"; }
+  const char *get_type_name() const override { return "MOSDPGPush"; }
 
-  void print(ostream& out) const {
+  void print(ostream& out) const override {
     out << "MOSDPGPush(" << pgid
 	<< " " << map_epoch
 	<< " " << pushes;
diff --git a/src/messages/MOSDPGPushReply.h b/src/messages/MOSDPGPushReply.h
index 52e3ddd8a58..180a201eb9e 100644
--- a/src/messages/MOSDPGPushReply.h
+++ b/src/messages/MOSDPGPushReply.h
@@ -49,11 +49,11 @@ public:
     }
   }
 
-  int get_cost() const {
+  int get_cost() const override {
     return cost;
   }
 
-  virtual void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(pgid.pgid, p);
     ::decode(map_epoch, p);
@@ -69,7 +69,7 @@ public:
     }
   }
 
-  virtual void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(pgid.pgid, payload);
     ::encode(map_epoch, payload);
     ::encode(replies, payload);
@@ -78,14 +78,14 @@ public:
     ::encode(from, payload);
   }
 
-  void print(ostream& out) const {
+  void print(ostream& out) const override {
     out << "MOSDPGPushReply(" << pgid
 	<< " " << map_epoch
 	<< " " << replies;
     out << ")";
   }
 
-  const char *get_type_name() const { return "MOSDPGPushReply"; }
+  const char *get_type_name() const override { return "MOSDPGPushReply"; }
 };
 
 #endif
diff --git a/src/messages/MOSDPGQuery.h b/src/messages/MOSDPGQuery.h
index 5ab5e70f9cf..d6029d0d9f7 100644
--- a/src/messages/MOSDPGQuery.h
+++ b/src/messages/MOSDPGQuery.h
@@ -46,11 +46,11 @@ class MOSDPGQuery : public Message {
     set_priority(CEPH_MSG_PRIO_HIGH);
   }
 private:
-  ~MOSDPGQuery() {}
+  ~MOSDPGQuery() override {}
 
 public:  
-  const char *get_type_name() const { return "pg_query"; }
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "pg_query"; }
+  void print(ostream& out) const override {
     out << "pg_query(";
     for (map<spg_t,pg_query_t>::const_iterator p = pg_list.begin();
 	 p != pg_list.end(); ++p) {
@@ -61,7 +61,7 @@ public:
     out << " epoch " << epoch << ")";
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(epoch, payload);
     vector<pair<pg_t, pg_query_t> > _pg_list;
     _pg_list.reserve(pg_list.size());
@@ -76,7 +76,7 @@ public:
     ::encode(_pg_list, payload, features);
     ::encode(_shard_list, payload);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(epoch, p);
     vector<pair<pg_t, pg_query_t> > _pg_list;
diff --git a/src/messages/MOSDPGRemove.h b/src/messages/MOSDPGRemove.h
index 502bd74dcaf..dcb44fffb3f 100644
--- a/src/messages/MOSDPGRemove.h
+++ b/src/messages/MOSDPGRemove.h
@@ -40,12 +40,12 @@ class MOSDPGRemove : public Message {
     pg_list.swap(l);
   }
 private:
-  ~MOSDPGRemove() {}
+  ~MOSDPGRemove() override {}
 
 public:  
-  const char *get_type_name() const { return "PGrm"; }
+  const char *get_type_name() const override { return "PGrm"; }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(epoch, payload);
 
     vector<pg_t> _pg_list;
@@ -59,7 +59,7 @@ public:
     ::encode(_pg_list, payload);
     ::encode(_shard_list, payload);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(epoch, p);
     vector<pg_t> _pg_list;
@@ -76,7 +76,7 @@ public:
       pg_list.push_back(spg_t(_pg_list[i], _shard_list[i]));
     }
   }
-  void print(ostream& out) const {
+  void print(ostream& out) const override {
     out << "osd pg remove(" << "epoch " << epoch << "; ";
     for (vector<spg_t>::const_iterator i = pg_list.begin();
          i != pg_list.end();
diff --git a/src/messages/MOSDPGScan.h b/src/messages/MOSDPGScan.h
index 9f66bd0e480..49f85ed2349 100644
--- a/src/messages/MOSDPGScan.h
+++ b/src/messages/MOSDPGScan.h
@@ -48,7 +48,7 @@ public:
     return pgid;
   }
 
-  virtual void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(op, p);
     ::decode(map_epoch, p);
@@ -74,7 +74,7 @@ public:
     }
   }
 
-  virtual void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(op, payload);
     ::encode(map_epoch, payload);
     ::encode(query_epoch, payload);
@@ -97,11 +97,11 @@ public:
       begin(be), end(en) {
   }
 private:
-  ~MOSDPGScan() {}
+  ~MOSDPGScan() override {}
 
 public:
-  const char *get_type_name() const { return "pg_scan"; }
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "pg_scan"; }
+  void print(ostream& out) const override {
     out << "pg_scan(" << get_op_name(op)
 	<< " " << pgid
 	<< " " << begin << "-" << end
diff --git a/src/messages/MOSDPGTemp.h b/src/messages/MOSDPGTemp.h
index 627ed71191c..5366fed1835 100644
--- a/src/messages/MOSDPGTemp.h
+++ b/src/messages/MOSDPGTemp.h
@@ -27,23 +27,23 @@ class MOSDPGTemp : public PaxosServiceMessage {
   MOSDPGTemp(epoch_t e) : PaxosServiceMessage(MSG_OSD_PGTEMP, e), map_epoch(e) { }
   MOSDPGTemp() : PaxosServiceMessage(MSG_OSD_PGTEMP, 0) {}
 private:
-  ~MOSDPGTemp() {}
+  ~MOSDPGTemp() override {}
 
 public:
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     paxos_encode();
     ::encode(map_epoch, payload);
     ::encode(pg_temp, payload);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     paxos_decode(p);
     ::decode(map_epoch, p);
     ::decode(pg_temp, p);
   }
 
-  const char *get_type_name() const { return "osd_pgtemp"; }
-  void print(ostream &out) const {
+  const char *get_type_name() const override { return "osd_pgtemp"; }
+  void print(ostream &out) const override {
     out << "osd_pgtemp(e" << map_epoch << " " << pg_temp << " v" << version << ")";
   }
   
diff --git a/src/messages/MOSDPGTrim.h b/src/messages/MOSDPGTrim.h
index eb19aefa42b..175579e1e3e 100644
--- a/src/messages/MOSDPGTrim.h
+++ b/src/messages/MOSDPGTrim.h
@@ -34,21 +34,21 @@ public:
     Message(MSG_OSD_PG_TRIM, HEAD_VERSION, COMPAT_VERSION),
     epoch(mv), pgid(p), trim_to(tt) { }
 private:
-  ~MOSDPGTrim() {}
+  ~MOSDPGTrim() override {}
 
 public:
-  const char *get_type_name() const { return "pg_trim"; }
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "pg_trim"; }
+  void print(ostream& out) const override {
     out << "pg_trim(" << pgid << " to " << trim_to << " e" << epoch << ")";
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(epoch, payload);
     ::encode(pgid.pgid, payload);
     ::encode(trim_to, payload);
     ::encode(pgid.shard, payload);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(epoch, p);
     ::decode(pgid.pgid, p);
diff --git a/src/messages/MOSDPGUpdateLogMissing.h b/src/messages/MOSDPGUpdateLogMissing.h
index b6a597705d5..bdb486c0818 100644
--- a/src/messages/MOSDPGUpdateLogMissing.h
+++ b/src/messages/MOSDPGUpdateLogMissing.h
@@ -60,24 +60,24 @@ public:
       entries(entries) {}
 
 private:
-  ~MOSDPGUpdateLogMissing() {}
+  ~MOSDPGUpdateLogMissing() override {}
 
 public:
-  const char *get_type_name() const { return "PGUpdateLogMissing"; }
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "PGUpdateLogMissing"; }
+  void print(ostream& out) const override {
     out << "pg_update_log_missing(" << pgid << " epoch " << map_epoch
 	<< " rep_tid " << rep_tid
 	<< " entries " << entries << ")";
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(map_epoch, payload);
     ::encode(pgid, payload);
     ::encode(from, payload);
     ::encode(rep_tid, payload);
     ::encode(entries, payload);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(map_epoch, p);
     ::decode(pgid, p);
diff --git a/src/messages/MOSDPGUpdateLogMissingReply.h b/src/messages/MOSDPGUpdateLogMissingReply.h
index 34e8d9e6c1d..58d7de0b40f 100644
--- a/src/messages/MOSDPGUpdateLogMissingReply.h
+++ b/src/messages/MOSDPGUpdateLogMissingReply.h
@@ -66,22 +66,22 @@ public:
     {}
 
 private:
-  ~MOSDPGUpdateLogMissingReply() {}
+  ~MOSDPGUpdateLogMissingReply() override {}
 
 public:
-  const char *get_type_name() const { return "PGUpdateLogMissingReply"; }
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "PGUpdateLogMissingReply"; }
+  void print(ostream& out) const override {
     out << "pg_update_log_missing_reply(" << pgid << " epoch " << map_epoch
 	<< " rep_tid " << rep_tid << ")";
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(map_epoch, payload);
     ::encode(pgid, payload);
     ::encode(from, payload);
     ::encode(rep_tid, payload);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(map_epoch, p);
     ::decode(pgid, p);
diff --git a/src/messages/MOSDPing.h b/src/messages/MOSDPing.h
index 4451a478b1f..ce75ad84857 100644
--- a/src/messages/MOSDPing.h
+++ b/src/messages/MOSDPing.h
@@ -61,10 +61,10 @@ class MOSDPing : public Message {
     : Message(MSG_OSD_PING, HEAD_VERSION, COMPAT_VERSION)
   {}
 private:
-  ~MOSDPing() {}
+  ~MOSDPing() override {}
 
 public:
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(fsid, p);
     ::decode(map_epoch, p);
@@ -74,7 +74,7 @@ public:
     if (header.version >= 2)
       ::decode(stamp, p);
   }
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(fsid, payload);
     ::encode(map_epoch, payload);
     ::encode(peer_as_of_epoch, payload);
@@ -83,8 +83,8 @@ public:
     ::encode(stamp, payload);
   }
 
-  const char *get_type_name() const { return "osd_ping"; }
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "osd_ping"; }
+  void print(ostream& out) const override {
     out << "osd_ping(" << get_op_name(op)
 	<< " e" << map_epoch
       //<< " as_of " << peer_as_of_epoch
diff --git a/src/messages/MOSDRepOp.h b/src/messages/MOSDRepOp.h
index de5e4755697..e4a4ef8d009 100644
--- a/src/messages/MOSDRepOp.h
+++ b/src/messages/MOSDRepOp.h
@@ -70,11 +70,11 @@ public:
     return pgid;
   }
 
-  int get_cost() const {
+  int get_cost() const override {
     return data.length();
   }
 
-  virtual void decode_payload() {
+  void decode_payload() override {
     p = payload.begin();
     // splitted to partial and final
     ::decode(map_epoch, p);
@@ -103,7 +103,7 @@ public:
     final_decode_needed = false;
   }
 
-  virtual void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(map_epoch, payload);
     ::encode(reqid, payload);
     ::encode(pgid, payload);
@@ -140,11 +140,11 @@ public:
     set_tid(rtid);
   }
 private:
-  ~MOSDRepOp() {}
+  ~MOSDRepOp() override {}
 
 public:
-  const char *get_type_name() const { return "osd_repop"; }
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "osd_repop"; }
+  void print(ostream& out) const override {
     out << "osd_repop(" << reqid
           << " " << pgid;
     if (!final_decode_needed) {
diff --git a/src/messages/MOSDRepOpReply.h b/src/messages/MOSDRepOpReply.h
index b9c0c22d2af..04a5707dfbe 100644
--- a/src/messages/MOSDRepOpReply.h
+++ b/src/messages/MOSDRepOpReply.h
@@ -57,7 +57,7 @@ public:
     return pgid;
   }
 
-  virtual void decode_payload() {
+  void decode_payload() override {
     p = payload.begin();
     ::decode(map_epoch, p);
     ::decode(reqid, p);
@@ -74,7 +74,7 @@ public:
     ::decode(from, p);
     final_decode_needed = false;
   }
-  virtual void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(map_epoch, payload);
     ::encode(reqid, payload);
     ::encode(pgid, payload);
@@ -116,12 +116,12 @@ public:
       ack_type(0), result(0),
       final_decode_needed(true) {}
 private:
-  ~MOSDRepOpReply() {}
+  ~MOSDRepOpReply() override {}
 
 public:
-  const char *get_type_name() const { return "osd_repop_reply"; }
+  const char *get_type_name() const override { return "osd_repop_reply"; }
 
-  void print(ostream& out) const {
+  void print(ostream& out) const override {
     out << "osd_repop_reply(" << reqid
         << " " << pgid;
     if (!final_decode_needed) {
diff --git a/src/messages/MOSDRepScrub.h b/src/messages/MOSDRepScrub.h
index 07e04543b26..a1134bac39d 100644
--- a/src/messages/MOSDRepScrub.h
+++ b/src/messages/MOSDRepScrub.h
@@ -64,11 +64,11 @@ struct MOSDRepScrub : public MOSDFastDispatchOp {
 
 
 private:
-  ~MOSDRepScrub() {}
+  ~MOSDRepScrub() override {}
 
 public:
-  const char *get_type_name() const { return "replica scrub"; }
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "replica scrub"; }
+  void print(ostream& out) const override {
     out << "replica scrub(pg: ";
     out << pgid << ",from:" << scrub_from << ",to:" << scrub_to
         << ",epoch:" << map_epoch << ",start:" << start << ",end:" << end
@@ -79,7 +79,7 @@ public:
     out << ")";
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(pgid.pgid, payload);
     ::encode(scrub_from, payload);
     ::encode(scrub_to, payload);
@@ -91,7 +91,7 @@ public:
     ::encode(pgid.shard, payload);
     ::encode(seed, payload);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(pgid.pgid, p);
     ::decode(scrub_from, p);
diff --git a/src/messages/MOSDScrub.h b/src/messages/MOSDScrub.h
index 72661f89598..8c52b043fa6 100644
--- a/src/messages/MOSDScrub.h
+++ b/src/messages/MOSDScrub.h
@@ -40,11 +40,11 @@ struct MOSDScrub : public Message {
     Message(MSG_OSD_SCRUB, HEAD_VERSION, COMPAT_VERSION),
     fsid(f), scrub_pgs(pgs), repair(r), deep(d) {}
 private:
-  ~MOSDScrub() {}
+  ~MOSDScrub() override {}
 
 public:
-  const char *get_type_name() const { return "scrub"; }
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "scrub"; }
+  void print(ostream& out) const override {
     out << "scrub(";
     if (scrub_pgs.empty())
       out << "osd";
@@ -57,13 +57,13 @@ public:
     out << ")";
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(fsid, payload);
     ::encode(scrub_pgs, payload);
     ::encode(repair, payload);
     ::encode(deep, payload);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(fsid, p);
     ::decode(scrub_pgs, p);
diff --git a/src/messages/MOSDSubOp.h b/src/messages/MOSDSubOp.h
index bfd8d4dbe31..3bab8f57770 100644
--- a/src/messages/MOSDSubOp.h
+++ b/src/messages/MOSDSubOp.h
@@ -99,13 +99,13 @@ public:
     return pgid;
   }
 
-  int get_cost() const {
+  int get_cost() const override {
     if (ops.size() == 1 && ops[0].op.op == CEPH_OSD_OP_PULL)
       return ops[0].op.extent.length;
     return data.length();
   }
 
-  virtual void decode_payload() {
+  void decode_payload() override {
     //since we drop incorrect_pools flag, now we only support
     //version >=7
     assert (header.version >= 7);
@@ -186,7 +186,7 @@ public:
 
   void finish_decode() { }
 
-  virtual void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     header.version = HEAD_VERSION;
     ::encode(map_epoch, payload);
     ::encode(reqid, payload);
@@ -263,11 +263,11 @@ public:
     set_tid(rtid);
   }
 private:
-  ~MOSDSubOp() {}
+  ~MOSDSubOp() override {}
 
 public:
-  const char *get_type_name() const { return "osd_sub_op"; }
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "osd_sub_op"; }
+  void print(ostream& out) const override {
     out << "osd_sub_op(" << reqid
 	<< " " << pgid
 	<< " " << poid
diff --git a/src/messages/MOSDSubOpReply.h b/src/messages/MOSDSubOpReply.h
index 95965697a6c..691d4e2c110 100644
--- a/src/messages/MOSDSubOpReply.h
+++ b/src/messages/MOSDSubOpReply.h
@@ -60,7 +60,7 @@ public:
     return pgid;
   }
 
-  virtual void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(map_epoch, p);
     ::decode(reqid, p);
@@ -95,7 +95,7 @@ public:
 
   void finish_decode() { }
 
-  virtual void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(map_epoch, payload);
     ::encode(reqid, payload);
     ::encode(pgid.pgid, payload);
@@ -152,12 +152,12 @@ public:
   MOSDSubOpReply()
     : MOSDFastDispatchOp(MSG_OSD_SUBOPREPLY, HEAD_VERSION, COMPAT_VERSION) {}
 private:
-  ~MOSDSubOpReply() {}
+  ~MOSDSubOpReply() override {}
 
 public:
-  const char *get_type_name() const { return "osd_subop_reply"; }
+  const char *get_type_name() const override { return "osd_subop_reply"; }
   
-  void print(ostream& out) const {
+  void print(ostream& out) const override {
     out << "osd_sub_op_reply(" << reqid
 	<< " " << pgid 
 	<< " " << poid << " " << ops;
diff --git a/src/messages/MPGStats.h b/src/messages/MPGStats.h
index 21ad1ed7d6d..dcceff2b3c2 100644
--- a/src/messages/MPGStats.h
+++ b/src/messages/MPGStats.h
@@ -35,15 +35,15 @@ public:
   {}
 
 private:
-  ~MPGStats() {}
+  ~MPGStats() override {}
 
 public:
-  const char *get_type_name() const { return "pg_stats"; }
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "pg_stats"; }
+  void print(ostream& out) const override {
     out << "pg_stats(" << pg_stat.size() << " pgs tid " << get_tid() << " v " << version << ")";
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     paxos_encode();
     ::encode(fsid, payload);
     ::encode(osd_stat, payload);
@@ -51,7 +51,7 @@ public:
     ::encode(epoch, payload);
     ::encode(had_map_for, payload);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     paxos_decode(p);
     ::decode(fsid, p);
diff --git a/src/messages/MPGStatsAck.h b/src/messages/MPGStatsAck.h
index 0b7b99e8aac..361ba7cac0c 100644
--- a/src/messages/MPGStatsAck.h
+++ b/src/messages/MPGStatsAck.h
@@ -24,18 +24,18 @@ public:
   MPGStatsAck() : Message(MSG_PGSTATSACK) {}
 
 private:
-  ~MPGStatsAck() {}
+  ~MPGStatsAck() override {}
 
 public:
-  const char *get_type_name() const { return "pg_stats_ack"; }
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "pg_stats_ack"; }
+  void print(ostream& out) const override {
     out << "pg_stats_ack(" << pg_stat.size() << " pgs tid " << get_tid() << ")";
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(pg_stat, payload);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(pg_stat, p);
   }
diff --git a/src/messages/MPing.h b/src/messages/MPing.h
index 60fb38b20d5..ce11edaf769 100644
--- a/src/messages/MPing.h
+++ b/src/messages/MPing.h
@@ -22,12 +22,12 @@ class MPing : public Message {
  public:
   MPing() : Message(CEPH_MSG_PING) {}
 private:
-  ~MPing() {}
+  ~MPing() override {}
 
 public:
-  void decode_payload() { }
-  void encode_payload(uint64_t features) { }
-  const char *get_type_name() const { return "ping"; }
+  void decode_payload() override { }
+  void encode_payload(uint64_t features) override { }
+  const char *get_type_name() const override { return "ping"; }
 };
 
 #endif
diff --git a/src/messages/MPoolOp.h b/src/messages/MPoolOp.h
index d864741204b..e694bbe7c90 100644
--- a/src/messages/MPoolOp.h
+++ b/src/messages/MPoolOp.h
@@ -49,11 +49,11 @@ public:
   }
 
 private:
-  ~MPoolOp() {}
+  ~MPoolOp() override {}
 
 public:
-  const char *get_type_name() const { return "poolop"; }
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "poolop"; }
+  void print(ostream& out) const override {
     out << "pool_op(" << ceph_pool_op_name(op) << " pool " << pool
 	<< " auid " << auid
 	<< " tid " << get_tid()
@@ -61,7 +61,7 @@ public:
 	<< " v" << version << ")";
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     paxos_encode();
     ::encode(fsid, payload);
     ::encode(pool, payload);
@@ -73,7 +73,7 @@ public:
     ::encode(pad, payload);  /* for v3->v4 encoding change */
     ::encode(crush_rule, payload);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     paxos_decode(p);
     ::decode(fsid, p);
diff --git a/src/messages/MPoolOpReply.h b/src/messages/MPoolOpReply.h
index d4fa50a6e02..abc489b5e11 100644
--- a/src/messages/MPoolOpReply.h
+++ b/src/messages/MPoolOpReply.h
@@ -44,15 +44,15 @@ public:
       response_data.claim(*blp);
   }
 
-  const char *get_type_name() const { return "poolopreply"; }
+  const char *get_type_name() const override { return "poolopreply"; }
 
-  void print(ostream& out) const {
+  void print(ostream& out) const override {
     out << "pool_op_reply(tid " << get_tid()
 	<< " " << cpp_strerror(-replyCode)
 	<< " v" << version << ")";
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     paxos_encode();
     ::encode(fsid, payload);
     ::encode(replyCode, payload);
@@ -63,7 +63,7 @@ public:
     } else
       ::encode(false, payload);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     paxos_decode(p);
     ::decode(fsid, p);
diff --git a/src/messages/MRecoveryReserve.h b/src/messages/MRecoveryReserve.h
index 29f1732aaca..66cce149af6 100644
--- a/src/messages/MRecoveryReserve.h
+++ b/src/messages/MRecoveryReserve.h
@@ -40,11 +40,11 @@ public:
       pgid(pgid), query_epoch(query_epoch),
       type(type) {}
 
-  const char *get_type_name() const {
+  const char *get_type_name() const override {
     return "MRecoveryReserve";
   }
 
-  void print(ostream& out) const {
+  void print(ostream& out) const override {
     out << "MRecoveryReserve ";
     switch (type) {
     case REQUEST:
@@ -61,7 +61,7 @@ public:
     return;
   }
 
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(pgid.pgid, p);
     ::decode(query_epoch, p);
@@ -72,7 +72,7 @@ public:
       pgid.shard = shard_id_t::NO_SHARD;
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(pgid.pgid, payload);
     ::encode(query_epoch, payload);
     ::encode(type, payload);
diff --git a/src/messages/MRemoveSnaps.h b/src/messages/MRemoveSnaps.h
index 6568ffaeb07..9b0fa4ae7f6 100644
--- a/src/messages/MRemoveSnaps.h
+++ b/src/messages/MRemoveSnaps.h
@@ -27,19 +27,19 @@ struct MRemoveSnaps : public PaxosServiceMessage {
     snaps.swap(s);
   }
 private:
-  ~MRemoveSnaps() {}
+  ~MRemoveSnaps() override {}
 
 public:
-  const char *get_type_name() const { return "remove_snaps"; }
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "remove_snaps"; }
+  void print(ostream& out) const override {
     out << "remove_snaps(" << snaps << " v" << version << ")";
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     paxos_encode();
     ::encode(snaps, payload);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     paxos_decode(p);
     ::decode(snaps, p);
diff --git a/src/messages/MRoute.h b/src/messages/MRoute.h
index ef9dd34cd76..053d2768f26 100644
--- a/src/messages/MRoute.h
+++ b/src/messages/MRoute.h
@@ -48,13 +48,13 @@ struct MRoute : public Message {
     msg = decode_message(NULL, 0, p);
   }
 private:
-  ~MRoute() {
+  ~MRoute() override {
     if (msg)
       msg->put();
   }
 
 public:
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(session_mon_tid, p);
     ::decode(dest, p);
@@ -70,7 +70,7 @@ public:
       ::decode(send_osdmap_first, p);
     }
   }
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(session_mon_tid, payload);
     ::encode(dest, payload, features);
     bool m = msg ? true : false;
@@ -80,8 +80,8 @@ public:
     ::encode(send_osdmap_first, payload);
   }
 
-  const char *get_type_name() const { return "route"; }
-  void print(ostream& o) const {
+  const char *get_type_name() const override { return "route"; }
+  void print(ostream& o) const override {
     if (msg)
       o << "route(" << *msg;
     else
diff --git a/src/messages/MStatfs.h b/src/messages/MStatfs.h
index ec19f6ee585..bf7560d0734 100644
--- a/src/messages/MStatfs.h
+++ b/src/messages/MStatfs.h
@@ -30,19 +30,19 @@ public:
   }
 
 private:
-  ~MStatfs() {}
+  ~MStatfs() override {}
 
 public:
-  const char *get_type_name() const { return "statfs"; }
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "statfs"; }
+  void print(ostream& out) const override {
     out << "statfs(" << get_tid() << " v" << version << ")";
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     paxos_encode();
     ::encode(fsid, payload);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     paxos_decode(p);
     ::decode(fsid, p);
diff --git a/src/messages/MStatfsReply.h b/src/messages/MStatfsReply.h
index 59312abe700..dd9690dad6a 100644
--- a/src/messages/MStatfsReply.h
+++ b/src/messages/MStatfsReply.h
@@ -27,15 +27,15 @@ public:
     h.version = epoch;
   }
 
-  const char *get_type_name() const { return "statfs_reply"; }
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "statfs_reply"; }
+  void print(ostream& out) const override {
     out << "statfs_reply(" << header.tid << ")";
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(h, payload);
   }
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(h, p);
   }
diff --git a/src/messages/MTimeCheck.h b/src/messages/MTimeCheck.h
index 647580ecfa2..83ba51fc89e 100644
--- a/src/messages/MTimeCheck.h
+++ b/src/messages/MTimeCheck.h
@@ -40,10 +40,10 @@ struct MTimeCheck : public Message
   { }
 
 private:
-  ~MTimeCheck() { }
+  ~MTimeCheck() override { }
 
 public:
-  const char *get_type_name() const { return "time_check"; }
+  const char *get_type_name() const override { return "time_check"; }
   const char *get_op_name() const {
     switch (op) {
     case OP_PING: return "ping";
@@ -52,7 +52,7 @@ public:
     }
     return "???";
   }
-  void print(ostream &o) const {
+  void print(ostream &o) const override {
     o << "time_check( " << get_op_name()
       << " e " << epoch << " r " << round;
     if (op == OP_PONG) {
@@ -64,7 +64,7 @@ public:
     o << " )";
   }
 
-  void decode_payload() {
+  void decode_payload() override {
     bufferlist::iterator p = payload.begin();
     ::decode(op, p);
     ::decode(epoch, p);
@@ -74,7 +74,7 @@ public:
     ::decode(latencies, p);
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ::encode(op, payload);
     ::encode(epoch, payload);
     ::encode(round, payload);
diff --git a/src/messages/MWatchNotify.h b/src/messages/MWatchNotify.h
index 9f7d568c491..15325abf61c 100644
--- a/src/messages/MWatchNotify.h
+++ b/src/messages/MWatchNotify.h
@@ -44,10 +44,10 @@ class MWatchNotify : public Message {
       return_code(0),
       notifier_gid(0) { }
 private:
-  ~MWatchNotify() {}
+  ~MWatchNotify() override {}
 
 public:
-  void decode_payload() {
+  void decode_payload() override {
     uint8_t msg_ver;
     bufferlist::iterator p = payload.begin();
     ::decode(msg_ver, p);
@@ -66,7 +66,7 @@ public:
     else
       notifier_gid = 0;
   }
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     uint8_t msg_ver = 1;
     ::encode(msg_ver, payload);
     ::encode(opcode, payload);
@@ -78,8 +78,8 @@ public:
     ::encode(notifier_gid, payload);
   }
 
-  const char *get_type_name() const { return "watch-notify"; }
-  void print(ostream& out) const {
+  const char *get_type_name() const override { return "watch-notify"; }
+  void print(ostream& out) const override {
     out << "watch-notify("
 	<< ceph_watch_event_name(opcode) << " (" << (int)opcode << ")"
 	<< " cookie " << cookie
diff --git a/src/messages/PaxosServiceMessage.h b/src/messages/PaxosServiceMessage.h
index f33ba3603d5..a85ac9e6c4a 100644
--- a/src/messages/PaxosServiceMessage.h
+++ b/src/messages/PaxosServiceMessage.h
@@ -23,7 +23,7 @@ class PaxosServiceMessage : public Message {
       version(v), deprecated_session_mon(-1), deprecated_session_mon_tid(0),
       rx_election_epoch(0)  { }
  protected:
-  ~PaxosServiceMessage() {}
+  ~PaxosServiceMessage() override {}
 
  public:
   void paxos_encode() {
@@ -38,12 +38,12 @@ class PaxosServiceMessage : public Message {
     ::decode(deprecated_session_mon_tid, p);
   }
 
-  void encode_payload(uint64_t features) {
+  void encode_payload(uint64_t features) override {
     ceph_abort();
     paxos_encode();
   }
 
-  void decode_payload() {
+  void decode_payload() override {
     ceph_abort();
     bufferlist::iterator p = payload.begin();
     paxos_decode(p);
@@ -64,7 +64,7 @@ class PaxosServiceMessage : public Message {
     return session;
   }
   
-  const char *get_type_name() const { return "PaxosServiceMessage"; }
+  const char *get_type_name() const override { return "PaxosServiceMessage"; }
 };
 
 #endif
diff --git a/src/msg/Connection.h b/src/msg/Connection.h
index 4c6ce86cb52..76910b65b7b 100644
--- a/src/msg/Connection.h
+++ b/src/msg/Connection.h
@@ -70,7 +70,7 @@ public:
       rx_buffers_version(0) {
   }
 
-  virtual ~Connection() {
+  ~Connection() override {
     //generic_dout(0) << "~Connection " << this << dendl;
     if (priv) {
       //generic_dout(0) << "~Connection " << this << " dropping priv " << priv << dendl;
diff --git a/src/msg/DispatchQueue.h b/src/msg/DispatchQueue.h
index b4366cef489..e07e5fbbe9a 100644
--- a/src/msg/DispatchQueue.h
+++ b/src/msg/DispatchQueue.h
@@ -98,7 +98,7 @@ class DispatchQueue {
     DispatchQueue *dq;
   public:
     explicit DispatchThread(DispatchQueue *dq) : dq(dq) {}
-    void *entry() {
+    void *entry() override {
       dq->entry();
       return 0;
     }
@@ -112,7 +112,7 @@ class DispatchQueue {
     DispatchQueue *dq;
   public:
     explicit LocalDeliveryThread(DispatchQueue *dq) : dq(dq) {}
-    void *entry() {
+    void *entry() override {
       dq->run_local_delivery();
       return 0;
     }
diff --git a/src/msg/Message.h b/src/msg/Message.h
index 63e6d115036..dd1990336fd 100644
--- a/src/msg/Message.h
+++ b/src/msg/Message.h
@@ -287,7 +287,7 @@ public:
   }
 
 protected:
-  virtual ~Message() {
+  ~Message() override {
     if (byte_throttler)
       byte_throttler->put(payload.length() + middle.length() + data.length());
     release_message_throttle();
diff --git a/src/msg/SimplePolicyMessenger.h b/src/msg/SimplePolicyMessenger.h
index b283dca9af3..466eb1d34c4 100644
--- a/src/msg/SimplePolicyMessenger.h
+++ b/src/msg/SimplePolicyMessenger.h
@@ -43,7 +43,7 @@ public:
    *
    * @return A const Policy reference.
    */
-  virtual Policy get_policy(int t) {
+  Policy get_policy(int t) override {
     Mutex::Locker l(policy_lock);
     map<int, Policy>::iterator iter =
       policy_map.find(t);
@@ -53,7 +53,7 @@ public:
       return default_policy;
   }
 
-  virtual Policy get_default_policy() {
+  Policy get_default_policy() override {
     Mutex::Locker l(policy_lock);
     return default_policy;
   }
@@ -66,7 +66,7 @@ public:
    *
    * @param p The Policy to apply.
    */
-  virtual void set_default_policy(Policy p) {
+  void set_default_policy(Policy p) override {
     Mutex::Locker l(policy_lock);
     default_policy = p;
   }
@@ -78,7 +78,7 @@ public:
    * @param type The peer type this policy applies to.
    * @param p The policy to apply.
    */
-  virtual void set_policy(int type, Policy p) {
+  void set_policy(int type, Policy p) override {
     Mutex::Locker l(policy_lock);
     policy_map[type] = p;
   }
@@ -96,7 +96,7 @@ public:
    */
   void set_policy_throttlers(int type,
 			     Throttle *byte_throttle,
-			     Throttle *msg_throttle) {
+			     Throttle *msg_throttle) override {
     Mutex::Locker l(policy_lock);
     map<int, Policy>::iterator iter =
       policy_map.find(type);
diff --git a/src/msg/async/AsyncConnection.h b/src/msg/async/AsyncConnection.h
index 6be3707d094..24773afa97f 100644
--- a/src/msg/async/AsyncConnection.h
+++ b/src/msg/async/AsyncConnection.h
@@ -154,7 +154,7 @@ class AsyncConnection : public Connection {
                              DispatchQueue *q, uint64_t cid)
       : msgr(omsgr), center(c), dispatch_queue(q), conn_id(cid),
         stop_dispatch(false) { }
-    ~DelayedDelivery() {
+    ~DelayedDelivery() override {
       assert(register_time_events.empty());
       assert(delay_queue.empty());
     }
@@ -187,7 +187,7 @@ class AsyncConnection : public Connection {
 
  public:
   AsyncConnection(CephContext *cct, AsyncMessenger *m, DispatchQueue *q, Worker *w);
-  ~AsyncConnection();
+  ~AsyncConnection() override;
   void maybe_start_delay_thread();
 
   ostream& _conn_prefix(std::ostream *_dout);
diff --git a/src/msg/async/AsyncMessenger.h b/src/msg/async/AsyncMessenger.h
index f43e4d738bd..c234a70a442 100644
--- a/src/msg/async/AsyncMessenger.h
+++ b/src/msg/async/AsyncMessenger.h
@@ -89,18 +89,18 @@ public:
    * Destroy the AsyncMessenger. Pretty simple since all the work is done
    * elsewhere.
    */
-  virtual ~AsyncMessenger();
+  ~AsyncMessenger() override;
 
   /** @defgroup Accessors
    * @{
    */
   void set_addr_unknowns(const entity_addr_t &addr) override;
 
-  int get_dispatch_queue_len() {
+  int get_dispatch_queue_len() override {
     return dispatch_queue.get_queue_len();
   }
 
-  double get_dispatch_queue_max_age(utime_t now) {
+  double get_dispatch_queue_max_age(utime_t now) override {
     return dispatch_queue.get_max_age(now);
   }
   /** @} Accessors */
@@ -109,14 +109,14 @@ public:
    * @defgroup Configuration functions
    * @{
    */
-  void set_cluster_protocol(int p) {
+  void set_cluster_protocol(int p) override {
     assert(!started && !did_bind);
     cluster_protocol = p;
   }
 
-  int bind(const entity_addr_t& bind_addr);
-  int rebind(const set<int>& avoid_ports);
-  int client_bind(const entity_addr_t& bind_addr);
+  int bind(const entity_addr_t& bind_addr) override;
+  int rebind(const set<int>& avoid_ports) override;
+  int client_bind(const entity_addr_t& bind_addr) override;
 
   /** @} Configuration functions */
 
@@ -148,8 +148,8 @@ public:
    */
   ConnectionRef get_connection(const entity_inst_t& dest) override;
   ConnectionRef get_loopback_connection() override;
-  virtual void mark_down(const entity_addr_t& addr) override;
-  virtual void mark_down_all() override {
+  void mark_down(const entity_addr_t& addr) override;
+  void mark_down_all() override {
     shutdown_connections(true);
   }
   /** @} // Connection Management */
diff --git a/src/msg/async/Event.h b/src/msg/async/Event.h
index d1c7350cb0d..5b89f53fbcd 100644
--- a/src/msg/async/Event.h
+++ b/src/msg/async/Event.h
@@ -223,7 +223,7 @@ class EventCenter {
    public:
     C_submit_event(func &&_f, bool nw)
       : f(std::move(_f)), nonwait(nw) {}
-    void do_request(int id) {
+    void do_request(int id) override {
       f();
       lock.lock();
       cond.notify_all();
diff --git a/src/msg/async/EventEpoll.h b/src/msg/async/EventEpoll.h
index 4f43bc8c36d..abc4b8bbbfb 100644
--- a/src/msg/async/EventEpoll.h
+++ b/src/msg/async/EventEpoll.h
@@ -30,7 +30,7 @@ class EpollDriver : public EventDriver {
 
  public:
   explicit EpollDriver(CephContext *c): epfd(-1), events(NULL), cct(c), size(0) {}
-  virtual ~EpollDriver() {
+  ~EpollDriver() override {
     if (epfd != -1)
       close(epfd);
 
diff --git a/src/msg/async/EventSelect.h b/src/msg/async/EventSelect.h
index b0668d52767..1b75da0b1b0 100644
--- a/src/msg/async/EventSelect.h
+++ b/src/msg/async/EventSelect.h
@@ -29,7 +29,7 @@ class SelectDriver : public EventDriver {
 
  public:
   explicit SelectDriver(CephContext *c): max_fd(0), cct(c) {}
-  virtual ~SelectDriver() {}
+  ~SelectDriver() override {}
 
   int init(EventCenter *c, int nevent) override;
   int add_event(int fd, int cur_mask, int add_mask) override;
diff --git a/src/msg/async/PosixStack.h b/src/msg/async/PosixStack.h
index 1263054f23d..0fb00a8537b 100644
--- a/src/msg/async/PosixStack.h
+++ b/src/msg/async/PosixStack.h
@@ -26,13 +26,13 @@
 
 class PosixWorker : public Worker {
   NetHandler net;
-  virtual void initialize();
+  void initialize() override;
  public:
   PosixWorker(CephContext *c, unsigned i)
       : Worker(c, i), net(c) {}
-  virtual int listen(entity_addr_t &sa, const SocketOptions &opt,
+  int listen(entity_addr_t &sa, const SocketOptions &opt,
                      ServerSocket *socks) override;
-  virtual int connect(const entity_addr_t &addr, const SocketOptions &opts, ConnectedSocket *socket) override;
+  int connect(const entity_addr_t &addr, const SocketOptions &opts, ConnectedSocket *socket) override;
 };
 
 class PosixNetworkStack : public NetworkStack {
@@ -47,11 +47,11 @@ class PosixNetworkStack : public NetworkStack {
       return -1;
     return coreids[id % coreids.size()];
   }
-  virtual void spawn_worker(unsigned i, std::function<void ()> &&func) override {
+  void spawn_worker(unsigned i, std::function<void ()> &&func) override {
     threads.resize(i+1);
     threads[i] = std::thread(func);
   }
-  virtual void join_worker(unsigned i) override {
+  void join_worker(unsigned i) override {
     assert(threads.size() > i && threads[i].joinable());
     threads[i].join();
   }
diff --git a/src/msg/async/Stack.h b/src/msg/async/Stack.h
index c16308cc9c4..2ddfa8c6754 100644
--- a/src/msg/async/Stack.h
+++ b/src/msg/async/Stack.h
@@ -293,7 +293,7 @@ class NetworkStack : public CephContext::ForkWatcher {
  public:
   NetworkStack(const NetworkStack &) = delete;
   NetworkStack& operator=(const NetworkStack &) = delete;
-  virtual ~NetworkStack() {
+  ~NetworkStack() override {
     for (auto &&w : workers)
       delete w;
   }
@@ -329,11 +329,11 @@ class NetworkStack : public CephContext::ForkWatcher {
   virtual void spawn_worker(unsigned i, std::function<void ()> &&) = 0;
   virtual void join_worker(unsigned i) = 0;
 
-  virtual void handle_pre_fork() override {
+  void handle_pre_fork() override {
     stop();
   }
 
-  virtual void handle_post_fork() override {
+  void handle_post_fork() override {
     start();
   }
 
diff --git a/src/msg/simple/Pipe.cc b/src/msg/simple/Pipe.cc
index ef90d04b81b..b2b5fcbe924 100644
--- a/src/msg/simple/Pipe.cc
+++ b/src/msg/simple/Pipe.cc
@@ -85,7 +85,7 @@ public:
       stop_delayed_delivery(false),
       delay_dispatching(false),
       stop_fast_dispatching_flag(false) { }
-  ~DelayedDelivery() {
+  ~DelayedDelivery() override {
     discard();
   }
   void *entry() override;
diff --git a/src/msg/simple/Pipe.h b/src/msg/simple/Pipe.h
index 8b74136c5fc..5324c108d55 100644
--- a/src/msg/simple/Pipe.h
+++ b/src/msg/simple/Pipe.h
@@ -48,7 +48,7 @@ static const int SM_IOV_MAX = (IOV_MAX >= 1024 ? IOV_MAX / 4 : IOV_MAX);
       Pipe *pipe;
     public:
       explicit Reader(Pipe *p) : pipe(p) {}
-      void *entry() { pipe->reader(); return 0; }
+      void *entry() override { pipe->reader(); return 0; }
     } reader_thread;
 
     /**
@@ -59,14 +59,14 @@ static const int SM_IOV_MAX = (IOV_MAX >= 1024 ? IOV_MAX / 4 : IOV_MAX);
       Pipe *pipe;
     public:
       explicit Writer(Pipe *p) : pipe(p) {}
-      void *entry() { pipe->writer(); return 0; }
+      void *entry() override { pipe->writer(); return 0; }
     } writer_thread;
 
     class DelayedDelivery;
     DelayedDelivery *delay_thread;
   public:
     Pipe(SimpleMessenger *r, int st, PipeConnection *con);
-    ~Pipe();
+    ~Pipe() override;
 
     SimpleMessenger *msgr;
     uint64_t conn_id;
diff --git a/src/msg/simple/PipeConnection.h b/src/msg/simple/PipeConnection.h
index 7a8e9d0a65a..04139193854 100644
--- a/src/msg/simple/PipeConnection.h
+++ b/src/msg/simple/PipeConnection.h
@@ -31,7 +31,7 @@ public:
     : Connection(cct, m),
       pipe(NULL) { }
 
-  ~PipeConnection();
+  ~PipeConnection() override;
 
   Pipe* get_pipe();
 
diff --git a/src/msg/simple/SimpleMessenger.h b/src/msg/simple/SimpleMessenger.h
index 65005fda98c..9c5f43e89ba 100644
--- a/src/msg/simple/SimpleMessenger.h
+++ b/src/msg/simple/SimpleMessenger.h
@@ -88,18 +88,18 @@ public:
    * Destroy the SimpleMessenger. Pretty simple since all the work is done
    * elsewhere.
    */
-  virtual ~SimpleMessenger();
+  ~SimpleMessenger() override;
 
   /** @defgroup Accessors
    * @{
    */
   void set_addr_unknowns(const entity_addr_t& addr) override;
 
-  int get_dispatch_queue_len() {
+  int get_dispatch_queue_len() override {
     return dispatch_queue.get_queue_len();
   }
 
-  double get_dispatch_queue_max_age(utime_t now) {
+  double get_dispatch_queue_max_age(utime_t now) override {
     return dispatch_queue.get_max_age(now);
   }
   /** @} Accessors */
@@ -108,14 +108,14 @@ public:
    * @defgroup Configuration functions
    * @{
    */
-  void set_cluster_protocol(int p) {
+  void set_cluster_protocol(int p) override {
     assert(!started && !did_bind);
     cluster_protocol = p;
   }
 
-  int bind(const entity_addr_t& bind_addr);
-  int rebind(const set<int>& avoid_ports);
-  int client_bind(const entity_addr_t& bind_addr);
+  int bind(const entity_addr_t& bind_addr) override;
+  int rebind(const set<int>& avoid_ports) override;
+  int client_bind(const entity_addr_t& bind_addr) override;
 
   /** @} Configuration functions */
 
@@ -123,9 +123,9 @@ public:
    * @defgroup Startup/Shutdown
    * @{
    */
-  virtual int start();
-  virtual void wait();
-  virtual int shutdown();
+  int start() override;
+  void wait() override;
+  int shutdown() override;
 
   /** @} // Startup/Shutdown */
 
@@ -133,7 +133,7 @@ public:
    * @defgroup Messaging
    * @{
    */
-  virtual int send_message(Message *m, const entity_inst_t& dest) {
+  int send_message(Message *m, const entity_inst_t& dest) override {
     return _send_message(m, dest);
   }
 
@@ -147,13 +147,13 @@ public:
    * @defgroup Connection Management
    * @{
    */
-  virtual ConnectionRef get_connection(const entity_inst_t& dest);
-  virtual ConnectionRef get_loopback_connection();
+  ConnectionRef get_connection(const entity_inst_t& dest) override;
+  ConnectionRef get_loopback_connection() override;
   int send_keepalive(Connection *con);
-  virtual void mark_down(const entity_addr_t& addr);
+  void mark_down(const entity_addr_t& addr) override;
   void mark_down(Connection *con);
   void mark_disposable(Connection *con);
-  virtual void mark_down_all();
+  void mark_down_all() override;
   /** @} // Connection Management */
 protected:
   /**
@@ -163,7 +163,7 @@ protected:
   /**
    * Start up the DispatchQueue thread once we have somebody to dispatch to.
    */
-  virtual void ready();
+  void ready() override;
   /** @} // Messenger Interfaces */
 private:
   /**
@@ -193,7 +193,7 @@ private:
     SimpleMessenger *msgr;
   public:
     explicit ReaperThread(SimpleMessenger *m) : msgr(m) {}
-    void *entry() {
+    void *entry() override {
       msgr->reaper_entry();
       return 0;
     }