diff options
Diffstat (limited to 'tests/thin-arbiter.rc')
| -rw-r--r-- | tests/thin-arbiter.rc | 45 |
1 files changed, 22 insertions, 23 deletions
diff --git a/tests/thin-arbiter.rc b/tests/thin-arbiter.rc index c5ac00baaaf..e26d91b1907 100644 --- a/tests/thin-arbiter.rc +++ b/tests/thin-arbiter.rc @@ -106,7 +106,7 @@ volume ${V0}-index subvolumes ${V0}-io-threads end-volume -volume ${V0}-io-stats +volume $b type debug/io-stats option count-fop-hits off option latency-measurement off @@ -115,11 +115,6 @@ volume ${V0}-io-stats subvolumes ${V0}-index end-volume -volume $b - type performance/decompounder - subvolumes ${V0}-io-stats -end-volume - volume ${V0}-server type protocol/server option transport.listen-backlog 1024 @@ -178,7 +173,7 @@ function ta_start_mount_process() { mkdir -p $1 identifier=$(echo $1 | tr / .) - if glusterfs -p $B0/${identifier}.pid --volfile=$B0/mount.vol $1 + if glusterfs --entry-timeout=0 --attribute-timeout=0 -p $B0/${identifier}.pid --volfile=$B0/mount.vol $1 then cat $B0/$identifier.pid else @@ -187,6 +182,13 @@ function ta_start_mount_process() fi } +function ta_get_mount_pid() +{ + local mount_path=$1 + identifier=$(echo $mount_path | tr / .) + cat $B0/${identifier}.pid +} + function ta_create_mount_volfile() { local b0=$B0/$1 @@ -259,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 @@ -444,7 +433,6 @@ cat > $B0/glustershd.vol <<EOF volume ${V0}-replicate-0-client-0 type protocol/client option send-gids on - option transport.socket.lowlat off option transport.socket.keepalive-interval 2 option remote-host $H0 option remote-subvolume $b0 @@ -490,7 +478,6 @@ volume ${V0}-replicate-0-client-1 option send-gids on option non-blocking-io off option transport.listen-backlog 1024 - option transport.socket.lowlat off option transport.socket.keepalive-interval 2 option password a0ad63dd-8314-4f97-9160-1b93e3cb1f0b option username 459d48e8-2a92-4f11-89f2-077b29f6f86d @@ -509,7 +496,6 @@ volume ${V0}-replicate-0-thin-arbiter-client option remote-subvolume $ta option filter-O_DIRECT disable option non-blocking-io off - option transport.socket.lowlat off option transport.socket.keepalive-interval 2 option transport.socket.read-fail-log off option remote-host $H0 @@ -612,3 +598,16 @@ function ta_start_shd_process() return 1 fi } + +function ta_mount_child_up_status() +{ + local mount_path=$1 + #brick_id is (brick-num in volume info - 1) + local vol=$2 + local brick_id=$3 + local pid=$(ta_get_mount_pid $mount_path) + local fpath=$(generate_statedump $pid) + up=$(grep -a -B1 trusted.afr.$vol-client-$brick_id $fpath | head -1 | cut -f2 -d'=') + rm -f $fpath + echo "$up" +} |