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

osd/OSDMap: bump encoding version for require_min_compat_client #15046

Merged
merged 1 commit into from May 15, 2017

Conversation

Projects
None yet
3 participants
@ukernel
Member

ukernel commented May 11, 2017

Otherwise, OSDMap::decode() throws expcetion when decoding old
version osdmap

Signed-off-by: "Yan, Zheng" zyan@redhat.com

@ukernel ukernel requested a review from liewegas May 11, 2017

@@ -678,10 +676,11 @@ void OSDMap::Incremental::decode(bufferlist::iterator& bl)
}
if (struct_v >= 4) {
::decode(new_backfillfull_ratio, bl);
::decode(new_require_min_compat_client, bl);

This comment has been minimized.

@liewegas

liewegas May 11, 2017

Member

the DECODE_START above needs to change to 5 too

@@ -2460,10 +2457,11 @@ void OSDMap::decode(bufferlist::iterator& bl)
}
if (struct_v >= 3) {
::decode(backfillfull_ratio, bl);
::decode(require_min_compat_client, bl);

This comment has been minimized.

@liewegas

liewegas May 11, 2017

Member

same for this one

@liewegas

This comment has been minimized.

Member

liewegas commented May 11, 2017

Good catch. I was lazy not switching these, sorry!

osd/OSDMap: bump encoding version for require_min_compat_client
Otherwise, OSDMap::decode() throws expcetion when decoding old
version osdmap

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
@ukernel

This comment has been minimized.

Member

ukernel commented May 11, 2017

updated

@liewegas

This comment has been minimized.

Member

liewegas commented May 11, 2017

👍

@liewegas liewegas merged commit d53127a into ceph:master May 15, 2017

3 checks passed

Signed-off-by all commits in this PR are signed
Details
Unmodifed Submodules submodules for project are unmodified
Details
default Build finished.
Details

@ukernel ukernel deleted the ukernel:wip-osdmap-encode branch May 17, 2017

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