From 60bfc670c9efa19752be0e55a8d03e78851fc6dc Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 13 Oct 2010 12:11:14 -0700 Subject: [PATCH] osd: fix MOSDBoot versioning 1 is what it was before; make it 2. Signed-off-by: Sage Weil --- src/messages/MOSDBoot.h | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/messages/MOSDBoot.h b/src/messages/MOSDBoot.h index 6e98184d86d..ae5c965dcc1 100644 --- a/src/messages/MOSDBoot.h +++ b/src/messages/MOSDBoot.h @@ -26,18 +26,17 @@ class MOSDBoot : public PaxosServiceMessage { entity_addr_t hb_addr; entity_addr_t cluster_addr; - MOSDBoot() : PaxosServiceMessage( MSG_OSD_BOOT, 0){} + MOSDBoot() : PaxosServiceMessage(MSG_OSD_BOOT, 0) { } MOSDBoot(OSDSuperblock& s, entity_addr_t& hb_addr_ref) : PaxosServiceMessage(MSG_OSD_BOOT, s.current_epoch), - sb(s), hb_addr(hb_addr_ref), cluster_addr() { - } + sb(s), hb_addr(hb_addr_ref), cluster_addr() { } MOSDBoot(OSDSuperblock& s, entity_addr_t& hb_addr_ref, entity_addr_t& cluster_addr_ref) : - PaxosServiceMessage(MSG_OSD_BOOT, s.current_epoch), - sb(s), hb_addr(hb_addr_ref), cluster_addr(cluster_addr_ref) {} - + PaxosServiceMessage(MSG_OSD_BOOT, s.current_epoch), + sb(s), hb_addr(hb_addr_ref), cluster_addr(cluster_addr_ref) { } + private: - ~MOSDBoot() {} + ~MOSDBoot() { } public: const char *get_type_name() { return "osd_boot"; } @@ -46,7 +45,7 @@ public: } void encode_payload() { - header.version = 1; + header.version = 2; paxos_encode(); ::encode(sb, payload); ::encode(hb_addr, payload); @@ -57,7 +56,7 @@ public: paxos_decode(p); ::decode(sb, p); ::decode(hb_addr, p); - if (header.version >=1) + if (header.version >= 2) ::decode(cluster_addr, p); } };