diff --git a/Makefile.am b/Makefile.am index f2589e6d15b74231fb06ff2603fed45d31279b23..f7c34861389ebf86b16f087d586ff2e6c7fc568e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1365,6 +1365,7 @@ TEST_FILES = \ test/data/htools/hail-invalid-reloc.json \ test/data/htools/hail-node-evac.json \ test/data/htools/hail-reloc-drbd.json \ + test/data/htools/hbal-cpu-speed.data \ test/data/htools/hbal-dyn.data \ test/data/htools/hbal-excl-tags.data \ test/data/htools/hbal-split-insts.data \ diff --git a/test/data/htools/hbal-cpu-speed.data b/test/data/htools/hbal-cpu-speed.data new file mode 100644 index 0000000000000000000000000000000000000000..a1b412fe6609f47b68af29809ba90efdfa4f278d --- /dev/null +++ b/test/data/htools/hbal-cpu-speed.data @@ -0,0 +1,11 @@ +group-01|fake-uuid-01|preferred|| + +node-slow|1600|0|1400|100000|96000|8|M|fake-uuid-01|8||N|8|1|1.0 +node-fast|1600|0|1400|100000|96000|8|N|fake-uuid-01|8||N|8|1|3.0 + +inst1|100|1000|8|running|Y|node-slow|node-fast|drbd| +inst2|100|1000|8|running|Y|node-slow|node-fast|drbd| +inst3|100|1000|8|running|Y|node-fast|node-slow|drbd| +inst4|100|1000|8|running|Y|node-fast|node-slow|drbd| + + diff --git a/test/hs/shelltests/htools-balancing.test b/test/hs/shelltests/htools-balancing.test index 7208c482198e5dadc578530ff21cc7464bd0cafb..6910e07ffb63dd9257c5c31a98368e6ffea8d213 100644 --- a/test/hs/shelltests/htools-balancing.test +++ b/test/hs/shelltests/htools-balancing.test @@ -137,3 +137,8 @@ diff -u $T/simu-rebal-merged.tiered $T/simu-rebal.tiered.original ./test/hs/hbal -t$TESTDATA_DIR/hbal-dyn.data --ignore-dynu >>>/Cluster is already well balanced/ >>>=0 + +# Test CPU speed is taken into account +./test/hs/hbal -t$TESTDATA_DIR/hbal-cpu-speed.data --ignore-dynu +>>>/inst[12] node-slow:node-fast => node-fast:node-slow/ +>>>=0