From: Sage Weil <sage@redhat.com>
Date: Sun, 24 Mar 2019 15:28:42 +0000 (-0500)
Subject: Merge PR #27119 into nautilus
X-Git-Tag: v14.2.1~117
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e21e1044b7b7d05943a897859c2c9a6a3a309c80;p=ceph.git

Merge PR #27119 into nautilus

* refs/pull/27119/head:
	crush/CrushWrapper: make update_choose_args less chatty
	qa/standalone/crush/crush-choose-args: add weight-set tests
	qa/standalone/crush/crush-choose-args: fix test
	crush/CrushWrapper: move_item: do not clobber weight-set weights
	crush/CrushWrapper: create_or_move: make weight-set update optional
	mon/OSDMonitor: apply osd_crush_update_weight_set for reweight, create-or-move
	crush/CrushWrapper: insert_item: make weight-set update optional (for leaves only)
	crush/CrushWrapper: use adjust_item_weight_in_bucket for subtree reweight
	crush/CrushWrapper: fix detach_bucket, remove_item[_under] vs weight-sets
	crush/CrushWrapper: add update_weight_sets arg to adjust_item_weight_*
	crush/CrushWrapper: refactor adjust_weight_* into per-bucket helper
	crush/CrushWrapper: pass cct down into more places

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

e21e1044b7b7d05943a897859c2c9a6a3a309c80