From: Sage Weil Date: Wed, 28 Nov 2018 03:32:04 +0000 (-0600) Subject: Merge PR #24502 into master X-Git-Tag: v14.1.0~788 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cdcc5b452142ea2b61b55ae115dfcf8ad525c7d9;p=ceph.git Merge PR #24502 into master * refs/pull/24502/head: crushtool: implement --rebuild-class-roots command crushtool: make --reweight re-sum choose_args weight-sets too crushtool: --reweight should only reweight nonshadow roots crush/CrushWrapper: reclassify: use default parent for created buckets crush/CrushWrapper: reclassify: handle to-be-created buckets that we need twice test/cli/crushtool/reclassify: add second gabe test case crushtool: add --set-subtree-class; do not set class via --reclassify-root test/cli/crushtool/reclassify: add reclassify test cases doc/rados/operations/crush*: document reclassify doc/rados/operations/crush: remove instructions for separate crush trees for ssd crushtool: add --compare command crushtool: implement --reclassify crush/CrushCompiler: fix id scan to include class ids Reviewed-by: Josh Durgin --- cdcc5b452142ea2b61b55ae115dfcf8ad525c7d9