Merge PR #22091 into master

* refs/pull/22091/head:
	crush: update choose_args on bucket removal
	crush: update choose_args on bucket removal, resize, or position mismatch
	crush: create weight-set on demand when doing a choose-args reweight
	test/cli/crushtool: use straw2 buckets for choose-args test
	crush: weight_set_size -> weight_set_positions

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>

diff --cc src/crush/CrushWrapper.cc
Simple merge

diff --cc src/crush/CrushWrapper.h
Simple merge

diff --cc src/test/crush/CrushWrapper.cc
Simple merge