In the test provided disk move is desired because such move optimize location score. The disk move improves cluster score from about 3 to 2. That's why in the first test (factor=1.3) move is performed while in the second test it's avoided.
Signed-off-by: Oleg Ponomarev <[email protected]> --- Makefile.am | 1 + test/data/htools/hbal-avoid-disk-moves.data | 9 +++++++++ test/hs/shelltests/htools-hbal.test | 8 ++++++++ 3 files changed, 18 insertions(+) create mode 100644 test/data/htools/hbal-avoid-disk-moves.data diff --git a/Makefile.am b/Makefile.am index 57760c3..8efe813 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1714,6 +1714,7 @@ TEST_FILES = \ test/data/htools/hail-node-evac.json \ test/data/htools/hail-reloc-drbd.json \ test/data/htools/hail-reloc-drbd-crowded.json \ + test/data/htools/hbal-avoid-disk-moves.data \ test/data/htools/hbal-cpu-speed.data \ test/data/htools/hbal-desiredlocation-1.data \ test/data/htools/hbal-desiredlocation-2.data \ diff --git a/test/data/htools/hbal-avoid-disk-moves.data b/test/data/htools/hbal-avoid-disk-moves.data new file mode 100644 index 0000000..d51b758 --- /dev/null +++ b/test/data/htools/hbal-avoid-disk-moves.data @@ -0,0 +1,9 @@ +group-01|fake-uuid-01|preferred|| + +node-01|16384|0|15360|409600|357800|16|N|fake-uuid-01|1|power:a +node-02|16384|0|16384|409600|357800|16|N|fake-uuid-01|1|power:a +node-03|16384|0|16384|409600|409600|16|N|fake-uuid-01|1|power:b + +inst1|1024|51200|1|running|Y|node-01|node-02|drbd||1 + +htools:nlocation:power diff --git a/test/hs/shelltests/htools-hbal.test b/test/hs/shelltests/htools-hbal.test index b7b29d8..e552f5b 100644 --- a/test/hs/shelltests/htools-hbal.test +++ b/test/hs/shelltests/htools-hbal.test @@ -92,3 +92,11 @@ node-02 0 node-03 1/ >>>= 0 + +./test/hs/hbal -t $TESTDATA_DIR/hbal-avoid-disk-moves.data --avoid-disk-moves=1.2 +>>>/Solution length=[1-9]/ +>>>= 0 + +./test/hs/hbal -t $TESTDATA_DIR/hbal-avoid-disk-moves.data --avoid-disk-moves=1.8 +>>>/Solution length=0/ +>>>= 0 -- 1.9.1
