RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-09 01:38:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

messages/MMgrBeacon: fix pre-addrvec compat

Browse Source 
This was broken by 7f787704cd.  Old code
doesn't not decode an addrvec as an addr.

Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2018-06-06 20:05:17 -05:00
parent 43e7032418
commit 90513f1bd1
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/messages/MMgrBeacon.h
View File

@ -22,11 +22,10 @@
#include "include/types.h"
class MMgrBeacon : public PaxosServiceMessage {
static const int HEAD_VERSION = 7;
static const int COMPAT_VERSION = 1;
static const int HEAD_VERSION = 8;
static const int COMPAT_VERSION = 8;
protected:
uint64_t gid;
@ -111,10 +110,18 @@ public:
}
void encode_payload(uint64_t features) override {
header.version = HEAD_VERSION;
header.compat_version = COMPAT_VERSION;
using ceph::encode;
paxos_encode();
encode(server_addrs, payload, features);
if (!HAVE_FEATURE(features, SERVER_NAUTILUS)) {
header.version = 7;
header.compat_version = 1;
encode(server_addrs.legacy_addr(), payload, features);
} else {
encode(server_addrs, payload, features);
}
encode(gid, payload);
encode(available, payload);
encode(name, payload);
@ -137,7 +144,7 @@ public:
void decode_payload() override {
auto p = payload.cbegin();
paxos_decode(p);
decode(server_addrs, p);
decode(server_addrs, p); // entity_addr_t for version < 8
decode(gid, p);
decode(available, p);
decode(name, p);