diff options
| author | Sage Weil <sage@inktank.com> | 2012-10-02 14:59:11 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2012-10-04 17:01:33 -0700 |
| commit | aed3612f875a3aeb6463011cb630adc7c936adbd (patch) | |
| tree | d4be3faf174c7c7989d6a38d1b638e7afcc95c20 | |
| parent | c10932924453f8e4d9669e84b5d4305be911e19e (diff) | |
| download | ceph-aed3612f875a3aeb6463011cb630adc7c936adbd.tar.gz | |
MOSDBoot: fix compatibility with ~argonaut
I revved this message and forgot to set the compat version correctly,
preventing post-change (e.g., bobtail) OSDs from talking to pre-change
(e.g., argonaut) monitors. This was in b64641c.
Signed-off-by: Sage Weil <sage@inktank.com>
| -rw-r--r-- | src/messages/MOSDBoot.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/messages/MOSDBoot.h b/src/messages/MOSDBoot.h index 482f1dd5c5e..354ea6b0430 100644 --- a/src/messages/MOSDBoot.h +++ b/src/messages/MOSDBoot.h @@ -23,6 +23,7 @@ class MOSDBoot : public PaxosServiceMessage { static const int HEAD_VERSION = 3; + static const int COMPAT_VERSION = 2; public: OSDSuperblock sb; @@ -31,12 +32,12 @@ class MOSDBoot : public PaxosServiceMessage { epoch_t boot_epoch; // last epoch this daemon was added to the map (if any) MOSDBoot() - : PaxosServiceMessage(MSG_OSD_BOOT, 0, HEAD_VERSION), + : PaxosServiceMessage(MSG_OSD_BOOT, 0, HEAD_VERSION, COMPAT_VERSION), boot_epoch(0) { } MOSDBoot(OSDSuperblock& s, epoch_t be, const entity_addr_t& hb_addr_ref, const entity_addr_t& cluster_addr_ref) - : PaxosServiceMessage(MSG_OSD_BOOT, s.current_epoch, HEAD_VERSION), + : PaxosServiceMessage(MSG_OSD_BOOT, s.current_epoch, HEAD_VERSION, COMPAT_VERSION), sb(s), hb_addr(hb_addr_ref), cluster_addr(cluster_addr_ref), boot_epoch(be) |