From: Greg Farnum <greg@inktank.com>
Date: Fri, 3 Oct 2014 23:06:53 +0000 (-0700)
Subject: messages: provide an explicit COMPAT_VERSION in MMDSBeacon
X-Git-Tag: v0.86~5^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=35fd2722cc48e947275dce900c2de2785ae50a99;p=ceph.git

messages: provide an explicit COMPAT_VERSION in MMDSBeacon

We weren't setting an explicit compat version and so the Message
was setting it to the head version, breaking communication with
older daemons.

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

diff --git a/src/messages/MMDSBeacon.h b/src/messages/MMDSBeacon.h
index 8c103b175347..af62e439627e 100644
--- a/src/messages/MMDSBeacon.h
+++ b/src/messages/MMDSBeacon.h
@@ -121,6 +121,7 @@ WRITE_CLASS_ENCODER(MDSHealth)
 class MMDSBeacon : public PaxosServiceMessage {
 
   static const int HEAD_VERSION = 3;
+  static const int COMPAT_VERSION = 2;
 
   uuid_d fsid;
   uint64_t global_id;
@@ -136,9 +137,9 @@ class MMDSBeacon : public PaxosServiceMessage {
   MDSHealth health;
 
  public:
-  MMDSBeacon() : PaxosServiceMessage(MSG_MDS_BEACON, 0, HEAD_VERSION) { }
+  MMDSBeacon() : PaxosServiceMessage(MSG_MDS_BEACON, 0, HEAD_VERSION, COMPAT_VERSION) { }
   MMDSBeacon(const uuid_d &f, uint64_t g, string& n, epoch_t les, MDSMap::DaemonState st, version_t se) : 
-    PaxosServiceMessage(MSG_MDS_BEACON, les, HEAD_VERSION), 
+    PaxosServiceMessage(MSG_MDS_BEACON, les, HEAD_VERSION, COMPAT_VERSION),
     fsid(f), global_id(g), name(n), state(st), seq(se),
     standby_for_rank(-1) {
   }