qa/standalone/crush/crush-choose-args: fix test

- Make the initial weight-set actually consistent (summing)
- Fix the intermediate state so that it reflects a correctly
  maintained summation.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit f20c736e990f967804768a3e75a05c077a591595)

diff --git a/qa/standalone/crush/crush-choose-args.sh b/qa/standalone/crush/crush-choose-args.sh
index 0cd143e7324f31c4918d511a54d13553b67218c3..c5daaedc456081ce19abe8351b0945a66e52f260 100755 (executable)
--- a/qa/standalone/crush/crush-choose-args.sh
+++ b/qa/standalone/crush/crush-choose-args.sh
@@ -62,8 +62,8 @@ choose_args 0 {
   {
     bucket_id -1
     weight_set [
-      [ 3.000 ]
-      [ 3.000 ]
+      [ 2.000 ]
+      [ 2.000 ]
     ]
     ids [ -10 ]
   }
@@ -81,14 +81,17 @@ choose_args 0 {
 EOF
     crushtool -c $dir/map.txt -o $dir/map-new || return 1
     ceph osd setcrushmap -i $dir/map-new || return 1
+    ceph osd crush tree
 
     run_osd $dir 1 || return 1
+    ceph osd crush tree
     ceph osd getcrushmap > $dir/map-one-more || return 1
     crushtool -d $dir/map-one-more -o $dir/map-one-more.txt || return 1
     cat $dir/map-one-more.txt
     diff -u $dir/map-one-more.txt $CEPH_ROOT/src/test/crush/crush-choose-args-expected-one-more-3.txt || return 1
 
     destroy_osd $dir 1 || return 1
+    ceph osd crush tree
     ceph osd getcrushmap > $dir/map-one-less || return 1
     crushtool -d $dir/map-one-less -o $dir/map-one-less.txt || return 1
     diff -u $dir/map-one-less.txt $dir/map.txt || return 1

diff --git a/src/test/crush/crush-choose-args-expected-one-more-3.txt b/src/test/crush/crush-choose-args-expected-one-more-3.txt
index 53cc3d11900ec10a524ba6b79c12dcc7a442e5ab..6d9e30c540407d73537e36839fff8a3ef31efd32 100644 (file)
--- a/src/test/crush/crush-choose-args-expected-one-more-3.txt
+++ b/src/test/crush/crush-choose-args-expected-one-more-3.txt
@@ -58,8 +58,8 @@ choose_args 0 {
   {
     bucket_id -1
     weight_set [
-      [ 6.000 ]
-      [ 6.000 ]
+      [ 5.000 ]
+      [ 5.000 ]
     ]
     ids [ -10 ]
   }