RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-19 09:57:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16421 from tchaikov/wip-19939

Browse Source 
messages/: always set header.version in encode_payload()

Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
This commit is contained in:
Kefu Chai 2017-07-20 22:52:17 +08:00 committed by GitHub
commit 153d030e1d
8 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/messages/MOSDPGInfo.h
View File

@ -58,7 +58,9 @@ public:
}
void encode_payload(uint64_t features) override {
if (!HAVE_FEATURE(features, SERVER_LUMINOUS)) {
if (HAVE_FEATURE(features, SERVER_LUMINOUS)) {
header.version = HEAD_VERSION;
} else {
header.version = 4;
// for kraken+jewel only

1
src/messages/MOSDPGLog.h
View File

@ -82,6 +82,7 @@ public:
::encode(missing, payload);
::encode(query_epoch, payload);
if (HAVE_FEATURE(features, SERVER_LUMINOUS)) {
header.version = HEAD_VERSION;
::encode(past_intervals, payload);
} else {
header.version = 4;

4
src/messages/MOSDPGNotify.h
View File

@ -58,7 +58,9 @@ public:
const char *get_type_name() const override { return "PGnot"; }
void encode_payload(uint64_t features) override {
if (!HAVE_FEATURE(features, SERVER_LUMINOUS)) {
if (HAVE_FEATURE(features, SERVER_LUMINOUS)) {
header.version = HEAD_VERSION;
} else {
// for jewel+kraken compat only
header.version = 5;

4
src/messages/MOSDPGQuery.h
View File

@ -63,7 +63,9 @@ public:
}
void encode_payload(uint64_t features) override {
if (!HAVE_FEATURE(features, SERVER_LUMINOUS)) {
if (HAVE_FEATURE(features, SERVER_LUMINOUS)) {
header.version = HEAD_VERSION;
} else {
// for kraken/jewel only
header.version = 3;
::encode(epoch, payload);

4
src/messages/MOSDPGRemove.h
View File

@ -46,7 +46,9 @@ public:
const char *get_type_name() const override { return "PGrm"; }
void encode_payload(uint64_t features) override {
if (!HAVE_FEATURE(features, SERVER_LUMINOUS)) {
if (HAVE_FEATURE(features, SERVER_LUMINOUS)) {
header.version = HEAD_VERSION;
} else {
// for jewel+kraken
header.version = 2;
::encode(epoch, payload);

7
src/messages/MOSDPing.h
View File

@ -102,7 +102,10 @@ public:
::encode(map_epoch, payload);
// with luminous, we drop peer_as_of_epoch and peer_stat
if (!HAVE_FEATURE(features, SERVER_LUMINOUS)) {
if (HAVE_FEATURE(features, SERVER_LUMINOUS)) {
header.version = HEAD_VERSION;
::encode(op, payload);
} else {
epoch_t dummy_epoch = {};
osd_peer_stat_t dummy_stat = {};
header.version = 3;
@ -110,8 +113,6 @@ public:
::encode(dummy_epoch, payload);
::encode(op, payload);
::encode(dummy_stat, payload);
} else {
::encode(op, payload);
}
::encode(stamp, payload);
size_t s = 0;

1
src/messages/MOSDRepOp.h
View File

@ -115,6 +115,7 @@ public:
void encode_payload(uint64_t features) override {
::encode(map_epoch, payload);
if (HAVE_FEATURE(features, SERVER_LUMINOUS)) {
header.version = HEAD_VERSION;
::encode(min_epoch, payload);
encode_trace(payload, features);
} else {

1
src/messages/MOSDRepOpReply.h
View File

@ -86,6 +86,7 @@ public:
void encode_payload(uint64_t features) override {
::encode(map_epoch, payload);
if (HAVE_FEATURE(features, SERVER_LUMINOUS)) {
header.version = HEAD_VERSION;
::encode(min_epoch, payload);
encode_trace(payload, features);
} else {