diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/bugs/cli/bug-1378842-volume-get-all.t | 3 | ||||
| -rw-r--r-- | tests/thin-arbiter.rc | 13 | ||||
| -rw-r--r-- | tests/tier.rc | 159 | ||||
| -rw-r--r-- | tests/volume.rc | 4 |
4 files changed, 0 insertions, 179 deletions
diff --git a/tests/bugs/cli/bug-1378842-volume-get-all.t b/tests/bugs/cli/bug-1378842-volume-get-all.t index c798ce5ceff..be41f25b000 100644 --- a/tests/bugs/cli/bug-1378842-volume-get-all.t +++ b/tests/bugs/cli/bug-1378842-volume-get-all.t @@ -12,9 +12,6 @@ TEST $CLI volume set all server-quorum-ratio 80 # Execute volume get without having an explicit option, this should fail TEST ! $CLI volume get all -# Also volume get on an option not applicable for all volumes should fail -TEST ! $CLI volume get all cluster.tier-mode - # Execute volume get with an explicit global option TEST $CLI volume get all server-quorum-ratio EXPECT '80' volume_get_field all 'cluster.server-quorum-ratio' diff --git a/tests/thin-arbiter.rc b/tests/thin-arbiter.rc index 29edeb1222b..53d8022f598 100644 --- a/tests/thin-arbiter.rc +++ b/tests/thin-arbiter.rc @@ -261,33 +261,20 @@ end-volume volume ${V0}-distribute type cluster/distribute - option tier-hot-compact-frequency 604800 option rebal-throttle normal option force-migration off option lookup-optimize on option weighted-rebalance on option write-freq-threshold 0 option assert-no-child-down off - option tier-pause off - option watermark-low 75 - option tier-compact off option lock-migration off option lookup-unhashed on - option tier-demote-frequency 3600 - option watermark-hi 90 - option tier-cold-compact-frequency 604800 option randomize-hash-range-by-gfid off option unhashed-sticky-bit off option use-readdirp on option readdir-optimize off option xattr-name trusted.glusterfs.dht - option tier-max-mb 4000 - option tier-max-files 10000 - option tier-query-limit 100 option read-freq-threshold 0 - option tier-mode test - option tier-max-promote-file-size 0 - option tier-promote-frequency 120 option min-free-disk 10% option min-free-inodes 5% option rebalance-stats off diff --git a/tests/tier.rc b/tests/tier.rc deleted file mode 100644 index 88acdc791eb..00000000000 --- a/tests/tier.rc +++ /dev/null @@ -1,159 +0,0 @@ -#!/bin/bash - -# Common tier functions - -# Check if a file is being migrated -# by checking for the presence of -# the sticky bit -# Args: $1 : path to file - -function is_sticky_set () { - echo $1 - if [ -k $1 ]; - then - echo "yes" - else - echo "no" - fi -} - - -function exists_and_regular_file () { - filepath=$1 - if [ -n "$filepath" ]; - then - if [ -k "$filepath" ] - then - echo "no" - else - echo "yes" - fi - else - echo "no" - fi -} - - -function check_counters { - index=0 - ret=0 - rm -f /tmp/tc*.txt - echo "0" > /tmp/tc2.txt - $CLI volume tier $V0 status | grep localhost > /tmp/tc.txt - - promote=`cat /tmp/tc.txt |awk '{print $2}'` - demote=`cat /tmp/tc.txt |awk '{print $3}'` - if [ "${promote}" != "${1}" ]; then - echo "1" > /tmp/tc2.txt - - elif [ "${demote}" != "${2}" ]; then - echo "2" > /tmp/tc2.txt - fi - - # temporarily disable non-Linux tests. - case $OSTYPE in - NetBSD | FreeBSD | Darwin) - echo "0" > /tmp/tc2.txt - ;; - esac - cat /tmp/tc2.txt -} - - -function detach_start { - $CLI volume tier $1 detach start - echo $?; -} - - -# Grab md5sum without file path (failed attempt notifications are discarded) -function fingerprint { - md5sum $1 2> /dev/null | grep --only-matching -m 1 '^[0-9a-f]*' -} - - - -# Create a large number of files in the current directory. -# $1 : file name prefix. Will create files $2-1 to $2-$3 -# $2 : number of files - -function create_many_files { - filename=$1 - num=$2 - - for i in `seq 1 $num`; do - dd if=/dev/urandom of=./${dirname}/${filename}$i bs=104857 count=1; - done -} - - -function confirm_tier_removed { - $CLI system getspec $V0 | grep $1 - if [ $? == 0 ]; then - echo "1" - else - echo "0" - fi -} - -function confirm_vol_stopped { - $CLI volume stop $1 - if [ $? == 0 ]; then - echo "0" - else - echo "1" - fi -} - - -function sleep_first_cycle { - startTime=$(date +%s) - mod=$(( ( $startTime % $1 ) + 1 )) - sleep $mod -} - -function sleep_until_mid_cycle { - startTime=$(date +%s) - mod=$(( ( $startTime % $1 ) + 1 )) - mod=$(( $1 - $mod )) - mod=$(( $mod + $1 / 2 )) - sleep $mod -} - -function tier_daemon_check () { - pgrep -f "tierd/$V0" - echo "$?" -} - -function rebalance_run_time () { - local time=$($CLI volume tier $1 status | awk '{print $6}' | sed -n 3p); - local hh=$(echo $time | cut -d ':' -f1); - local mm=$(echo $time | cut -d ':' -f2); - local ss=$(echo $time | cut -d ':' -f3); - local total=$(($hh * 3600 + $mm * 60 + $ss)); - echo $total; -} - -function tier_detach_commit () { - $CLI_1 volume tier $V0 detach commit | grep "success" | wc -l -} - -function tier_detach_status_node_down () { - $CLI_1 volume tier $V0 detach status | grep "WARNING" | wc -l -} - -function tier_status_node_down () { - $CLI_1 volume tier $V0 status | grep "WARNING" | wc -l -} - -function tier_detach_status () { - $CLI_1 volume tier $V0 detach status | grep "success" | wc -l -} - -function wait_for_tier_start () { - sleep 5 -} - -function tier_detach_commit_for_single_node () { - $CLI volume tier $V0 detach commit | grep "success" | wc -l -} diff --git a/tests/volume.rc b/tests/volume.rc index de99e7038f4..7dd829210e3 100644 --- a/tests/volume.rc +++ b/tests/volume.rc @@ -84,10 +84,6 @@ function fix-layout_status_field { $CLI volume rebalance $1 status | awk '{print $2,$3,$4}' |sed -n 3p |tr -d '[^0-9+\.]'|sed 's/ *$//g' } -function detach_tier_status_field_complete { - $CLI volume tier $1 detach status | awk '{print $7}' |sed -n 4p -} - function remove_brick_status_completed_field { local vol=$1 local brick_list=$2 |