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

crush/CrushWrapper: chooseargs encoding fix #15984

Merged
merged 3 commits into from Jul 1, 2017

Conversation

Projects
None yet
3 participants
@idryomov
Contributor

idryomov commented Jun 28, 2017

No description provided.

idryomov added some commits Jun 27, 2017

crush/CrushWrapper: encode choose_args.size() as __u32
choose_args.size() returns size_t, which is not fixed size.  Given that
choose_args code just open-codes our std::map encoder, do what we do for
std::map.

This was introduced in commit dbe36e0 ("crush: compile/decompile
crush_choose_arg_map") under SERVER_LUMINOUS bit.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
crush/CrushWrapper: crush_choose_arg::ids should be __s32
crush_choose_arg::ids array is encoded on the wire.  int is not fixed
size -- use __s32 instead (crush_bucket::id is __s32).

This was introduced in commit dbe36e0 ("crush: compile/decompile
crush_choose_arg_map") under SERVER_LUMINOUS bit.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
PendingReleaseNotes: add a note on choose_args encoding
It's unlikely that it's been used yet, but worth a note.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
@idryomov

This comment has been minimized.

Contributor

idryomov commented Jun 30, 2017

Addressed @liewegas's nit and added a release node. No functional changes, but had to rebase to avoid a conflict in PendingReleaseNotes.

@liewegas liewegas merged commit 715968d into ceph:master Jul 1, 2017

4 checks passed

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

@idryomov idryomov deleted the idryomov:wip-chooseargs-encoding-fix branch Jul 1, 2017

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