Add a shell test for hbal and split instances

This is not perfect, as we only test that hbal completes successfully
and that it show a score improvement, but it's better than nothing.

Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: René Nussbaumer <rn@google.com>

diff --git a/Makefile.am b/Makefile.am
index 138c6ca..7acea3c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -736,6 +736,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-split-insts.data \
        test/data/htools/common-suffix.data \
        test/data/htools/invalid-node.data \
        test/data/htools/missing-resources.data \

diff --git a/test/data/htools/hbal-split-insts.data b/test/data/htools/hbal-split-insts.data
new file mode 100644 (file)
index 0000000..4d654e8
--- /dev/null
+++ b/test/data/htools/hbal-split-insts.data
@@ -0,0 +1,145 @@
+group-01|fake-uuid-01|preferred
+group-02|fake-uuid-02|preferred
+
+node-01-001|98304|0|96256|8388608|8355840|16|N|fake-uuid-01|1
+node-01-002|98304|0|96256|8388608|8355840|16|N|fake-uuid-01|1
+node-01-003|98304|0|96256|8388608|8355840|16|N|fake-uuid-01|1
+node-01-004|98304|0|96256|8388608|8355840|16|N|fake-uuid-01|1
+node-01-005|98304|0|96256|8388608|8355840|16|N|fake-uuid-01|1
+node-01-006|98304|0|96256|8388608|8355840|16|N|fake-uuid-01|1
+node-01-007|98304|0|96256|8388608|8355840|16|N|fake-uuid-02|1
+node-01-008|98304|0|96256|8388608|8355840|16|N|fake-uuid-02|1
+
+new-0|128|1024|1|running|Y|node-01-008|node-01-007|drbd||1
+new-1|128|1024|1|running|Y|node-01-006|node-01-005|drbd||1
+new-2|128|1024|1|running|Y|node-01-004|node-01-003|drbd||1
+new-3|128|1024|1|running|Y|node-01-002|node-01-001|drbd||1
+new-4|128|1024|1|running|Y|node-01-007|node-01-008|drbd||1
+new-5|128|1024|1|running|Y|node-01-005|node-01-006|drbd||1
+new-6|128|1024|1|running|Y|node-01-003|node-01-004|drbd||1
+new-7|128|1024|1|running|Y|node-01-001|node-01-002|drbd||1
+new-8|128|1024|1|running|Y|node-01-008|node-01-006|drbd||1
+new-9|128|1024|1|running|Y|node-01-007|node-01-005|drbd||1
+new-10|128|1024|1|running|Y|node-01-004|node-01-002|drbd||1
+new-11|128|1024|1|running|Y|node-01-003|node-01-001|drbd||1
+new-12|128|1024|1|running|Y|node-01-006|node-01-008|drbd||1
+new-13|128|1024|1|running|Y|node-01-005|node-01-007|drbd||1
+new-14|128|1024|1|running|Y|node-01-002|node-01-004|drbd||1
+new-15|128|1024|1|running|Y|node-01-001|node-01-003|drbd||1
+new-16|128|1024|1|running|Y|node-01-008|node-01-005|drbd||1
+new-17|128|1024|1|running|Y|node-01-007|node-01-006|drbd||1
+new-18|128|1024|1|running|Y|node-01-004|node-01-001|drbd||1
+new-19|128|1024|1|running|Y|node-01-003|node-01-002|drbd||1
+new-20|128|1024|1|running|Y|node-01-006|node-01-007|drbd||1
+new-21|128|1024|1|running|Y|node-01-005|node-01-008|drbd||1
+new-22|128|1024|1|running|Y|node-01-002|node-01-003|drbd||1
+new-23|128|1024|1|running|Y|node-01-001|node-01-004|drbd||1
+new-24|128|1024|1|running|Y|node-01-008|node-01-004|drbd||1
+new-25|128|1024|1|running|Y|node-01-007|node-01-003|drbd||1
+new-26|128|1024|1|running|Y|node-01-006|node-01-002|drbd||1
+new-27|128|1024|1|running|Y|node-01-005|node-01-001|drbd||1
+new-28|128|1024|1|running|Y|node-01-004|node-01-008|drbd||1
+new-29|128|1024|1|running|Y|node-01-003|node-01-007|drbd||1
+new-30|128|1024|1|running|Y|node-01-002|node-01-006|drbd||1
+new-31|128|1024|1|running|Y|node-01-001|node-01-005|drbd||1
+new-32|128|1024|1|running|Y|node-01-008|node-01-003|drbd||1
+new-33|128|1024|1|running|Y|node-01-007|node-01-004|drbd||1
+new-34|128|1024|1|running|Y|node-01-006|node-01-001|drbd||1
+new-35|128|1024|1|running|Y|node-01-005|node-01-002|drbd||1
+new-36|128|1024|1|running|Y|node-01-004|node-01-007|drbd||1
+new-37|128|1024|1|running|Y|node-01-003|node-01-008|drbd||1
+new-38|128|1024|1|running|Y|node-01-002|node-01-005|drbd||1
+new-39|128|1024|1|running|Y|node-01-001|node-01-006|drbd||1
+new-40|128|1024|1|running|Y|node-01-008|node-01-002|drbd||1
+new-41|128|1024|1|running|Y|node-01-007|node-01-001|drbd||1
+new-42|128|1024|1|running|Y|node-01-006|node-01-004|drbd||1
+new-43|128|1024|1|running|Y|node-01-005|node-01-003|drbd||1
+new-44|128|1024|1|running|Y|node-01-004|node-01-006|drbd||1
+new-45|128|1024|1|running|Y|node-01-003|node-01-005|drbd||1
+new-46|128|1024|1|running|Y|node-01-002|node-01-008|drbd||1
+new-47|128|1024|1|running|Y|node-01-001|node-01-007|drbd||1
+new-48|128|1024|1|running|Y|node-01-008|node-01-001|drbd||1
+new-49|128|1024|1|running|Y|node-01-007|node-01-002|drbd||1
+new-50|128|1024|1|running|Y|node-01-006|node-01-003|drbd||1
+new-51|128|1024|1|running|Y|node-01-005|node-01-004|drbd||1
+new-52|128|1024|1|running|Y|node-01-004|node-01-005|drbd||1
+new-53|128|1024|1|running|Y|node-01-003|node-01-006|drbd||1
+new-54|128|1024|1|running|Y|node-01-002|node-01-007|drbd||1
+new-55|128|1024|1|running|Y|node-01-001|node-01-008|drbd||1
+new-56|128|1024|1|running|Y|node-01-008|node-01-007|drbd||1
+new-57|128|1024|1|running|Y|node-01-006|node-01-005|drbd||1
+new-58|128|1024|1|running|Y|node-01-004|node-01-003|drbd||1
+new-59|128|1024|1|running|Y|node-01-002|node-01-001|drbd||1
+new-60|128|1024|1|running|Y|node-01-007|node-01-008|drbd||1
+new-61|128|1024|1|running|Y|node-01-005|node-01-006|drbd||1
+new-62|128|1024|1|running|Y|node-01-003|node-01-004|drbd||1
+new-63|128|1024|1|running|Y|node-01-001|node-01-002|drbd||1
+new-64|128|1024|1|running|Y|node-01-008|node-01-006|drbd||1
+new-65|128|1024|1|running|Y|node-01-007|node-01-005|drbd||1
+new-66|128|1024|1|running|Y|node-01-004|node-01-002|drbd||1
+new-67|128|1024|1|running|Y|node-01-003|node-01-001|drbd||1
+new-68|128|1024|1|running|Y|node-01-006|node-01-008|drbd||1
+new-69|128|1024|1|running|Y|node-01-005|node-01-007|drbd||1
+new-70|128|1024|1|running|Y|node-01-002|node-01-004|drbd||1
+new-71|128|1024|1|running|Y|node-01-001|node-01-003|drbd||1
+new-72|128|1024|1|running|Y|node-01-008|node-01-005|drbd||1
+new-73|128|1024|1|running|Y|node-01-007|node-01-006|drbd||1
+new-74|128|1024|1|running|Y|node-01-004|node-01-001|drbd||1
+new-75|128|1024|1|running|Y|node-01-003|node-01-002|drbd||1
+new-76|128|1024|1|running|Y|node-01-006|node-01-007|drbd||1
+new-77|128|1024|1|running|Y|node-01-005|node-01-008|drbd||1
+new-78|128|1024|1|running|Y|node-01-002|node-01-003|drbd||1
+new-79|128|1024|1|running|Y|node-01-001|node-01-004|drbd||1
+new-80|128|1024|1|running|Y|node-01-008|node-01-004|drbd||1
+new-81|128|1024|1|running|Y|node-01-007|node-01-003|drbd||1
+new-82|128|1024|1|running|Y|node-01-006|node-01-002|drbd||1
+new-83|128|1024|1|running|Y|node-01-005|node-01-001|drbd||1
+new-84|128|1024|1|running|Y|node-01-004|node-01-008|drbd||1
+new-85|128|1024|1|running|Y|node-01-003|node-01-007|drbd||1
+new-86|128|1024|1|running|Y|node-01-002|node-01-006|drbd||1
+new-87|128|1024|1|running|Y|node-01-001|node-01-005|drbd||1
+new-88|128|1024|1|running|Y|node-01-008|node-01-003|drbd||1
+new-89|128|1024|1|running|Y|node-01-007|node-01-004|drbd||1
+new-90|128|1024|1|running|Y|node-01-006|node-01-001|drbd||1
+new-91|128|1024|1|running|Y|node-01-005|node-01-002|drbd||1
+new-92|128|1024|1|running|Y|node-01-004|node-01-007|drbd||1
+new-93|128|1024|1|running|Y|node-01-003|node-01-008|drbd||1
+new-94|128|1024|1|running|Y|node-01-002|node-01-005|drbd||1
+new-95|128|1024|1|running|Y|node-01-001|node-01-006|drbd||1
+new-96|128|1024|1|running|Y|node-01-008|node-01-002|drbd||1
+new-97|128|1024|1|running|Y|node-01-007|node-01-001|drbd||1
+new-98|128|1024|1|running|Y|node-01-006|node-01-004|drbd||1
+new-99|128|1024|1|running|Y|node-01-005|node-01-003|drbd||1
+new-100|128|1024|1|running|Y|node-01-004|node-01-006|drbd||1
+new-101|128|1024|1|running|Y|node-01-003|node-01-005|drbd||1
+new-102|128|1024|1|running|Y|node-01-002|node-01-008|drbd||1
+new-103|128|1024|1|running|Y|node-01-001|node-01-007|drbd||1
+new-104|128|1024|1|running|Y|node-01-008|node-01-001|drbd||1
+new-105|128|1024|1|running|Y|node-01-007|node-01-002|drbd||1
+new-106|128|1024|1|running|Y|node-01-006|node-01-003|drbd||1
+new-107|128|1024|1|running|Y|node-01-005|node-01-004|drbd||1
+new-108|128|1024|1|running|Y|node-01-004|node-01-005|drbd||1
+new-109|128|1024|1|running|Y|node-01-003|node-01-006|drbd||1
+new-110|128|1024|1|running|Y|node-01-002|node-01-007|drbd||1
+new-111|128|1024|1|running|Y|node-01-001|node-01-008|drbd||1
+new-112|128|1024|1|running|Y|node-01-008|node-01-007|drbd||1
+new-113|128|1024|1|running|Y|node-01-006|node-01-005|drbd||1
+new-114|128|1024|1|running|Y|node-01-004|node-01-003|drbd||1
+new-115|128|1024|1|running|Y|node-01-002|node-01-001|drbd||1
+new-116|128|1024|1|running|Y|node-01-007|node-01-008|drbd||1
+new-117|128|1024|1|running|Y|node-01-005|node-01-006|drbd||1
+new-118|128|1024|1|running|Y|node-01-003|node-01-004|drbd||1
+new-119|128|1024|1|running|Y|node-01-001|node-01-002|drbd||1
+new-120|128|1024|1|running|Y|node-01-008|node-01-006|drbd||1
+new-121|128|1024|1|running|Y|node-01-007|node-01-005|drbd||1
+new-122|128|1024|1|running|Y|node-01-004|node-01-002|drbd||1
+new-123|128|1024|1|running|Y|node-01-003|node-01-001|drbd||1
+new-124|128|1024|1|running|Y|node-01-006|node-01-008|drbd||1
+new-125|128|1024|1|running|Y|node-01-005|node-01-007|drbd||1
+new-126|128|1024|1|running|Y|node-01-002|node-01-004|drbd||1
+new-127|128|1024|1|running|Y|node-01-001|node-01-003|drbd||1
+
+
+|128,1,1024,1,1,1|128,1,1024,1,1,1|32768,8,1048576,16,8,12|diskless,file,sharedfile,plain,blockdev,drbd,rbd|4.0|32.0
+group-01|128,1,1024,1,1,1|128,1,1024,1,1,1|32768,8,1048576,16,8,12|diskless,file,sharedfile,plain,blockdev,drbd,rbd|4.0|32.0
+group-02|128,1,1024,1,1,1|128,1,1024,1,1,1|32768,8,1048576,16,8,12|diskless,file,sharedfile,plain,blockdev,drbd,rbd|4.0|32.0

diff --git a/test/htools-multi-group.test b/test/htools-multi-group.test
index 5761a9c..561c0ad 100644 (file)
--- a/test/htools-multi-group.test
+++ b/test/htools-multi-group.test
@@ -38,3 +38,8 @@
 ./test/hcheck -t$T/simu-twogroups.tiered --machine-readable
 >>> /HCHECK_OK=1/
 >>>= 0
+
+# hcheck should be able to improve a group with split instances
+./test/hbal -t $TESTDATA_DIR/hbal-split-insts.data -G group-01 -O node-01-001
+>>> /Cluster score improved from .* to .*/
+>>>= 0