]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
osd/OSDMap: set pg_autoscale_mode with setting from conf 25746/head
authorKefu Chai <kchai@redhat.com>
Wed, 2 Jan 2019 16:20:13 +0000 (00:20 +0800)
committerKefu Chai <kchai@redhat.com>
Wed, 2 Jan 2019 17:40:28 +0000 (01:40 +0800)
commit7fc7a7d167d5297003f622492abf734cf2a24ca3
tree6b38d846a9bee8e14c5752f17e96da4a9c89d550
parent5c71f5421c13f6e7ff2e82c8313b40a857d6ec36
osd/OSDMap: set pg_autoscale_mode with setting from conf

* update build_simple_optioned() to set pg_autoscale_mode with the setting
  read from conf, otherwise it will be a random value in heap.
* update cli test accordingly, otherwise we will have

/home/jenkins-build/build/workspace/ceph-pull-requests/src/test/cli/osdmaptool/create-racks.t:
failed
---
/home/jenkins-build/build/workspace/ceph-pull-requests/src/test/cli/osdmaptool/create-racks.t
+++
/home/jenkins-build/build/workspace/ceph-pull-requests/src/test/cli/osdmaptool/create-racks.t.err
@@ -796,7 +796,7 @@
   nearfull_ratio 0
   min_compat_client jewel

-  pool 1 'rbd' replicated size 3 min_size 2 crush_rule 0 object_hash
rjenkins pg_num 15296 pgp_num 15296 last_change 0 flags hashpspool
stripe_width 0 application rbd
+  pool 1 'rbd' replicated size 3 min_size 2 crush_rule 0 object_hash
rjenkins pg_num 15296 pgp_num 15296 autoscale_mode ??? last_change 0
flags hashpspool stripe_width 0 application rbd

Signed-off-by: Kefu Chai <kchai@redhat.com>
src/osd/OSDMap.cc
src/test/cli/osdmaptool/clobber.t
src/test/cli/osdmaptool/create-print.t
src/test/cli/osdmaptool/create-racks.t