qa/workunits/cephtool/test.sh: remove two crushtool validation tests

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh
index 1588fded4e8a1ef78693cbf56b377ac6b65632f7..5bce08b029fee33ece71582e787fb1d4432e2e4a 100755 (executable)
--- a/qa/workunits/cephtool/test.sh
+++ b/qa/workunits/cephtool/test.sh
@@ -2242,65 +2242,6 @@ function test_mon_tell()
   ceph_watch_wait 'mon.b \[DBG\] from.*cmd=\[{"prefix": "version"}\]: dispatch'
 }
 
-function test_mon_crushmap_validation()
-{
-  local map=$TEMP_DIR/map
-  ceph osd getcrushmap -o $map
-
-  local crushtool_path="${TEMP_DIR}/crushtool"
-  touch "${crushtool_path}"
-  chmod +x "${crushtool_path}"
-  local crushtool_path_old=`ceph-conf --show-config-value crushtool`
-  ceph tell mon.\* injectargs --crushtool "${crushtool_path}"
-
-  printf "%s\n" \
-      "#!/bin/sh
-       cat > /dev/null
-       exit 0" > "${crushtool_path}"
-
-  ceph osd setcrushmap -i $map
-
-  printf "%s\n" \
-      "#!/bin/sh
-       cat > /dev/null
-       exit 1" > "${crushtool_path}"
-
-  expect_false ceph osd setcrushmap -i $map
-
-  printf "%s\n" \
-      "#!/bin/sh
-       cat > /dev/null
-       echo 'TEST FAIL' >&2
-       exit 1" > "${crushtool_path}"
-
-  expect_false ceph osd setcrushmap -i $map 2> $TMPFILE
-  check_response "Error EINVAL: Failed crushmap test: TEST FAIL"
-
-  local mon_lease=`ceph-conf --show-config-value mon_lease`
-  mon_lease=`echo ${mon_lease} | awk '{ printf $1 + 0 }'`
-
-  test "${mon_lease}" -gt 0
-
-  printf "%s\n" \
-      "#!/bin/sh
-       cat > /dev/null
-       sleep $((mon_lease - 1))" > "${crushtool_path}"
-
-  ceph osd setcrushmap -i $map
-
-  printf "%s\n" \
-      "#!/bin/sh
-       cat > /dev/null
-       sleep $((mon_lease + 1))" > "${crushtool_path}"
-
-  expect_false ceph osd setcrushmap -i $map 2> $TMPFILE
-  check_response "Error EINVAL: Failed crushmap test: ${crushtool_path}: timed out (${mon_lease} sec)"
-
-  ceph tell mon.\* injectargs --crushtool "${crushtool_path_old}"
-
-  rm -f "${crushtool_path}"
-}
-
 function test_mon_ping()
 {
   ceph ping mon.a
@@ -2446,7 +2387,6 @@ MON_TESTS+=" mon_osd_erasure_code"
 MON_TESTS+=" mon_osd_misc"
 MON_TESTS+=" mon_heap_profiler"
 MON_TESTS+=" mon_tell"
-MON_TESTS+=" mon_crushmap_validation"
 MON_TESTS+=" mon_ping"
 MON_TESTS+=" mon_deprecated_commands"
 MON_TESTS+=" mon_caps"

diff --git a/src/test/mon/osd-crush.sh b/src/test/mon/osd-crush.sh
index 3eb5f8cb7f2ba757755e5e12b3f69b3ba8dec067..68d90ca9d2e71d8cca4c3eb496c2e7014aa6b0eb 100755 (executable)
--- a/src/test/mon/osd-crush.sh
+++ b/src/test/mon/osd-crush.sh
@@ -119,15 +119,6 @@ function TEST_crush_rule_create_erasure() {
     ceph osd erasure-code-profile ls | grep default || return 1
     ceph osd crush rule rm $ruleset || return 1
     ! ceph osd crush rule ls | grep $ruleset || return 1
-    #
-    # verify that if the crushmap contains a bugous ruleset,
-    # it will prevent the creation of a pool.
-    #
-    local crushtool_path_old=`ceph-conf --show-config-value crushtool`
-    ceph tell mon.\* injectargs --crushtool "false"
-
-    expect_failure $dir "Error EINVAL" \
-        ceph osd pool create mypool 1 1 erasure || return 1
 }
 
 function check_ruleset_id_match_rule_id() {
@@ -239,69 +230,6 @@ function TEST_crush_tree() {
         $XMLSTARLET val -e -r $CEPH_ROOT/src/test/mon/osd-crush-tree.rng - || return 1
 }
 
-# NB: disable me if i am too time consuming
-function TEST_crush_repair_faulty_crushmap() {
-    local dir=$1
-    fsid=$(uuidgen)
-    MONA=127.0.0.1:7113 # git grep '\<7113\>' : there must be only one
-    MONB=127.0.0.1:7114 # git grep '\<7114\>' : there must be only one
-    MONC=127.0.0.1:7115 # git grep '\<7115\>' : there must be only one
-    CEPH_ARGS_orig=$CEPH_ARGS
-    CEPH_ARGS="--fsid=$fsid --auth-supported=none "
-    CEPH_ARGS+="--mon-initial-members=a,b,c "
-    CEPH_ARGS+="--mon-host=$MONA,$MONB,$MONC "
-    run_mon $dir a --public-addr $MONA || return 1
-    run_mon $dir b --public-addr $MONB || return 1
-    run_mon $dir c --public-addr $MONC || return 1
-
-    ceph osd pool create rbd 8
-
-    local empty_map=$dir/empty_map
-    :> $empty_map.txt
-    crushtool -c $empty_map.txt -o $empty_map.map || return 1
-
-    local crushtool_path_old=`ceph-conf --show-config-value crushtool`
-    ceph tell mon.\* injectargs --crushtool "true"
-    
-    
-    #import empty crushmap should failture.because the default pool rbd use the rule
-    ceph osd setcrushmap -i $empty_map.map  2>&1|grep "Error EINVAL:  the crush rule no"|| return 1
-
-    #remove the default pool rbd
-    ceph osd pool delete rbd rbd --yes-i-really-really-mean-it || return 1
-
-    #now it can be successful to set the empty crush map
-    ceph osd setcrushmap -i $empty_map.map || return 1
-
-    # should be an empty crush map without any buckets
-    success=false
-    for delay in 1 2 4 8 16 32 64 128 256 ; do
-        if test $(ceph osd crush dump --format=json | \
-                  jq '.buckets | length == 0') == true ; then
-            success=true
-            break
-        fi
-        sleep $delay
-    done
-    if ! $success ; then
-        ceph osd crush dump --format=json-pretty
-        return 1
-    fi
-    # bring them down, the "ceph" commands will try to hunt for other monitor in
-    # vain, after mon.a is offline
-    kill_daemons $dir || return 1
-    # rewrite the monstore with the good crush map,
-    $CEPH_ROOT/src/tools/ceph-monstore-update-crush.sh --rewrite $dir/a || return 1
-
-    run_mon $dir a --public-addr $MONA || return 1
-    run_mon $dir b --public-addr $MONB || return 1
-    run_mon $dir c --public-addr $MONC || return 1
-    # the buckets are back
-    test $(ceph osd crush dump --format=json | \
-           jq '.buckets | length > 0') == true || return 1
-    CEPH_ARGS=$CEPH_ARGS_orig
-}
-
 main osd-crush "$@"
 
 # Local Variables: