RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-21 01:47:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

osd: fix MOSDBoot versioning

Browse Source 
1 is what it was before; make it 2.

Signed-off-by: Sage Weil <sage@newdream.net>
This commit is contained in:
Sage Weil 2010-10-13 12:11:14 -07:00
parent 7f493a11cb
commit 60bfc670c9
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/messages/MOSDBoot.h
View File

@ -26,18 +26,17 @@ class MOSDBoot : public PaxosServiceMessage {
entity_addr_t hb_addr; entity_addr_t hb_addr;
entity_addr_t cluster_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) : MOSDBoot(OSDSuperblock& s, entity_addr_t& hb_addr_ref) :
PaxosServiceMessage(MSG_OSD_BOOT, s.current_epoch), 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, MOSDBoot(OSDSuperblock& s, entity_addr_t& hb_addr_ref,
entity_addr_t& cluster_addr_ref) : entity_addr_t& cluster_addr_ref) :
PaxosServiceMessage(MSG_OSD_BOOT, s.current_epoch), PaxosServiceMessage(MSG_OSD_BOOT, s.current_epoch),
sb(s), hb_addr(hb_addr_ref), cluster_addr(cluster_addr_ref) {} sb(s), hb_addr(hb_addr_ref), cluster_addr(cluster_addr_ref) { }
private: private:
~MOSDBoot() {} ~MOSDBoot() { }
public: public:
const char *get_type_name() { return "osd_boot"; } const char *get_type_name() { return "osd_boot"; }
@ -46,7 +45,7 @@ public:
} }
void encode_payload() { void encode_payload() {
header.version = 1; header.version = 2;
paxos_encode(); paxos_encode();
::encode(sb, payload); ::encode(sb, payload);
::encode(hb_addr, payload); ::encode(hb_addr, payload);
@ -57,7 +56,7 @@ public:
paxos_decode(p); paxos_decode(p);
::decode(sb, p); ::decode(sb, p);
::decode(hb_addr, p); ::decode(hb_addr, p);
if (header.version >=1) if (header.version >= 2)
::decode(cluster_addr, p); ::decode(cluster_addr, p);
} }
}; };