New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

messages: remove compat cruft #14475

Merged
merged 31 commits into from Apr 28, 2017

Conversation

Projects
None yet
3 participants
@liewegas
Member

liewegas commented Apr 12, 2017

Remove compat cruft from server to server messages for pre-jewel daemons.

decode_finish = true;
}
bl.copy(sizeof(object_stat_sum_t), (char*)(&num_bytes));
decode_finish = true;
#endif

This comment has been minimized.

@branch-predictor

branch-predictor Apr 13, 2017

Member

How about removing the decode_finish variable and use "#else" instead?

This comment has been minimized.

@liewegas

liewegas Apr 21, 2017

Member

i'm adding the if() back in so that it's clear how to add new fields next time it happens.

@tchaikov tchaikov self-assigned this Apr 13, 2017

vector<pair<pg_t, pg_query_t> > _pg_list;
::decode(_pg_list, p);
vector<shard_id_t> _shard_list(_pg_list.size(), shard_id_t::NO_SHARD);
_shard_list.clear();

This comment has been minimized.

@tchaikov

tchaikov Apr 13, 2017

Contributor

why not just _shard_list.reserve()?

@liewegas

This comment has been minimized.

Member

liewegas commented Apr 13, 2017

liewegas added some commits Apr 12, 2017

messages/MMonElection: drop old compat cruft
v5 was 8025fb3 (pre-firefly); v6 was
34b4ad7 (pre-kraken).

Signed-off-by: Sage Weil <sage@redhat.com>
message/MForward: drop compat cruft
v3 was 8773474 (pre-hammer).

Signed-off-by: Sage Weil <sage@redhat.com>
messages/MBackfilLReserve: drop compat cruft
v3 was 8b46dd1 (pre-firefly).

Signed-off-by: Sage Weil <sage@redhat.com>
messages/MMonPaxos: drop compat cruft
Signed-off-by: Sage Weil <sage@redhat.com>
messages/MMonScrub: drop compat cruft
v2 was 0a19fd4 (pre-infernalis).

Signed-off-by: Sage Weil <sage@redhat.com>
messages/MOSDBoot: drop compat cruft
v6 was bee9154 (pre-hammer).

Signed-off-by: Sage Weil <sage@redhat.com>
messages/MOSDFailure: drop compat cruft
v3 was 4f1792d (bobtail?).

Signed-off-by: Sage Weil <sage@redhat.com>
messages/MOSDMarkMeDown: drop compat cruft
v2 is 58ace1a (pre-giant).

Signed-off-by: Sage Weil <sage@redhat.com>
messages/MOSDPGBackfill: drop compat cruft
v3 is 8b46dd1 (pre-firefly).

Signed-off-by: Sage Weil <sage@redhat.com>
messages/MOSDPGCreate: remove compat cruft
v3 is 52cb44c (pre-hammer).

Signed-off-by: Sage Weil <sage@redhat.com>
messages/MOSDPGPull: remove compat cruft
v2 is 8b46dd1 (pre-firefly).

Signed-off-by: Sage Weil <sage@redhat.com>
messages/MOSDPGPull: remove compat cruft
v2 was 8b46dd1 (pre-firefly).

Signed-off-by: Sage Weil <sage@redhat.com>
messages/MOSDPGQuery: remove compat cruft
v3 was pre-firefly (8b46dd1).

Signed-off-by: Sage Weil <sage@redhat.com>
messages/MOSDPGQuery: simplify encoding for luminous+
Signed-off-by: Sage Weil <sage@redhat.com>
messages/MOSDPGRemove: remove compat cruft
v2 was 8b46dd1 (pre-firefly)

Signed-off-by: Sage Weil <sage@redhat.com>
messages/MOSDPGRemove: simplify encoding for luminous+
Signed-off-by: Sage Weil <sage@redhat.com>
messages/MOSDPGScan: remove compat cruft
v2 was 8b46dd1 (pre-firefly)

Signed-off-by: Sage Weil <sage@redhat.com>
messages/MOSDPGTrim: remove compat cruft
v2 was 8b46dd1 (pre-firefly)

Signed-off-by: Sage Weil <sage@redhat.com>
messages/MOSDPing: remove compat cruft
v2 was 4e2f0d1 (pre-argonaut).

Signed-off-by: Sage Weil <sage@redhat.com>
messages/MOSDRepScrub: remove compat cruft
v6 was 7d73f41 (pre-hammer).

Signed-off-by: Sage Weil <sage@redhat.com>
messages/MOSDScrub: remove compat cruft
v2 was 9013efd (pre-bobtail).

Signed-off-by: Sage Weil <sage@redhat.com>
messages/MRecoveryReserve: remove compat cruft
v2 was 9013efd (pre-firefly).

Signed-off-by: Sage Weil <sage@redhat.com>
messages/MRoute: remove compat cruft
v3 was 39e06ef (pre-jewel).

Signed-off-by: Sage Weil <sage@redhat.com>
messages/MMDSBeacon: remove (some) compat cruft
v7 is cdf8a29 (pre-kraken).
v6 is bcf4953 (pre-jewel).

Signed-off-by: Sage Weil <sage@redhat.com>

liewegas added some commits Apr 12, 2017

osd/osd_types: remove pg_query_t compat cruft
Signed-off-by: Sage Weil <sage@redhat.com>
osd/osd_types: remove pg_notify_t compat cruft
Signed-off-by: Sage Weil <sage@redhat.com>
osd/osd_types: remove pg_info_t compat cruft
v32 is d5ca7e9, pre-infernalis.

This is rewritten by PG::upgrade() on major upgrades so we don't need to
be able to decode old (very) versions.

Signed-off-by: Sage Weil <sage@redhat.com>
osd/osd_types: remove pg_stat_t compat cruft
v22 is 0643845 (pre-jewel).

Signed-off-by: Sage Weil <sage@redhat.com>

@liewegas liewegas added the needs-qa label Apr 21, 2017

@liewegas

This comment has been minimized.

Member

liewegas commented Apr 21, 2017

rebased

@liewegas

This comment has been minimized.

Member

liewegas commented Apr 23, 2017

2017-04-22T01:02:38.287 INFO:tasks.ceph.osd.4.smithi174.stderr:2017-04-22 01:02:30.318304 7f116f018700 -1 failed to decode message of type 80 v5: buffer::malformed_input: void object_stat_sum_t::decode(ceph::buffer::list::iterator&) unknown encoding version > 14

/a/sage-2017-04-21_23:56:14-rados-wip-sage-testing---basic-smithi/1054134

liewegas added some commits Apr 24, 2017

include/encoding: fix compat version error messages
These were just...wrong.  Correctly report the encoding version we
got and the oldest we can decode.

Signed-off-by: Sage Weil <sage@redhat.com>
osd/osd_types: remove compat cruft for object_stat_sum_t
v15 is 169cd4d (pre-jewel), but
the decode method still said v14.  Therefose, we leave the compat
version when we encode as 14.

v14 is 0643845 (pre-jewel).

Signed-off-by: Sage Weil <sage@redhat.com>
ceph-object-corpus: prune old types from decode tests
Signed-off-by: Sage Weil <sage@redhat.com>
@liewegas

This comment has been minimized.

Member

liewegas commented Apr 25, 2017

@tchaikov

This comment has been minimized.

Contributor

tchaikov commented Apr 25, 2017

will take a look tmr.

@liewegas

This comment has been minimized.

Member

liewegas commented Apr 27, 2017

@tchaikov ping

@tchaikov

This comment has been minimized.

Contributor

tchaikov commented Apr 27, 2017

ahh, i promise, i will review tomorrow. running out of time today.

::decode(_pg_list, p);
vector<shard_id_t> _shard_list(_pg_list.size(), shard_id_t::NO_SHARD);
if (header.version >= 3) {
if (header.version < 4) {

This comment has been minimized.

@tchaikov

tchaikov Apr 28, 2017

Contributor

nit, could be more specific, like

if (header.version == 3) {
@tchaikov

This comment has been minimized.

Contributor

tchaikov commented Apr 28, 2017

modulo the nit, lgtm.

@liewegas liewegas merged commit 0530a24 into ceph:master Apr 28, 2017

2 of 3 checks passed

Unmodifed Submodules Approval needed: modified submodules found
Details
Signed-off-by all commits in this PR are signed
Details
default Build finished.
Details

@liewegas liewegas deleted the liewegas:wip-message-compat-cruft branch Apr 28, 2017

@liewegas

This comment has been minimized.

Member

liewegas commented Apr 28, 2017

thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment