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

luminous: crush: various weight-set fixes #17214

Merged
merged 7 commits into from Aug 25, 2017

Conversation

Projects
None yet
3 participants
@tchaikov
Contributor

tchaikov commented Aug 24, 2017

backport #17014

xiexingguo added some commits Aug 14, 2017

crush: fix bucket index to weight-set
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit 859b066)
crush: fix bucket_add_item() won't update weight-set simultaneously
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit 475bdda)
crush: fix bucket_remove_item() won't update weight-set simultaneously
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit 0e1d37f)
crush: update crush_choose_arg_map size on resizing
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit 0c8ca02)
crush: CrushWrapper::add_bucket - do not allow caller pass in null 'i…
…dout'

*** Caught signal (Segmentation fault) **
 in thread 7f495c0f6300 thread_name:crushtool
 ceph version 12.1.2-768-gab69125 (ab6912523e779174f92f0b0fc10372bd0b645415) mimic (dev)
 1: (()+0x1a3d1) [0x7f495c1343d1]
 2: (()+0xf370) [0x7f4951deb370]
 3: (CrushWrapper::add_bucket(int, int, int, int, int, int*, int*, int*)+0x84) [0x7f49538ba084]
 4: (CrushCompiler::parse_bucket(__gnu_cxx::__normal_iterator<boost::spirit::tree_node<boost::spirit::node_val_data<char const*, boost::spirit::nil_t> >*, std::vector<boost::spirit::tree_node<boost::spirit::node_val_data<char const*, boost::spirit::nil_t> >, std::allocator<boost::spirit::tree_node<boost::spirit::node_val_data<char const*, boost::spirit::nil_t> > > > > const&)+0xef0) [0x7f49538dc170]
 5: (CrushCompiler::parse_crush(__gnu_cxx::__normal_iterator<boost::spirit::tree_node<boost::spirit::node_val_data<char const*, boost::spirit::nil_t> >*, std::vector<boost::spirit::tree_node<boost::spirit::node_val_data<char const*, boost::spirit::nil_t> >, std::allocator<boost::spirit::tree_node<boost::spirit::node_val_data<char const*, boost::spirit::nil_t> > > > > const&)+0x130) [0x7f49538dcba0]
 6: (CrushCompiler::compile(std::istream&, char const*)+0xb93) [0x7f49538deaa3]
 7: (main()+0x2615) [0x7f495c126015]
 8: (__libc_start_main()+0xf5) [0x7f49507ccb35]
 9: (()+0xf4b0) [0x7f495c1294b0]
2017-08-14 13:31:25.498050 7f495c0f6300 -1 *** Caught signal (Segmentation fault) **
 in thread 7f495c0f6300 thread_name:crushtool

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit dc8f925)
crush: fix bucket_adjust_item_weight() won't update weight-set correctly
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit d62c9f1)
crush: fix type mismatch
Pool IDs are of type int64_t instead of uint64_t.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit 507f970)

@tchaikov tchaikov added this to the luminous milestone Aug 24, 2017

@tchaikov tchaikov requested a review from liewegas Aug 24, 2017

@liewegas liewegas merged commit e49332b into ceph:luminous Aug 25, 2017

4 checks passed

Docs: build check OK - docs built
Details
Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
make check make check succeeded
Details

@tchaikov tchaikov deleted the tchaikov:wip-luminous-pr-17014 branch Aug 25, 2017

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