svn commit: r323085 - user/pho/stress2/misc
Peter Holm
pho at FreeBSD.org
Fri Sep 1 11:14:32 UTC 2017
Author: pho
Date: Fri Sep 1 11:14:30 2017
New Revision: 323085
URL: https://svnweb.freebsd.org/changeset/base/323085
Log:
Rename "tank" to a more unique name.
Sponsored by: Dell EMC Isilon
Modified:
user/pho/stress2/misc/crossmp7.sh
user/pho/stress2/misc/zfs.sh
user/pho/stress2/misc/zfs2.sh
user/pho/stress2/misc/zfs3.sh
user/pho/stress2/misc/zfs4.sh
user/pho/stress2/misc/zfs5.sh
user/pho/stress2/misc/zfs6.sh
Modified: user/pho/stress2/misc/crossmp7.sh
==============================================================================
--- user/pho/stress2/misc/crossmp7.sh Fri Sep 1 09:48:19 2017 (r323084)
+++ user/pho/stress2/misc/crossmp7.sh Fri Sep 1 11:14:30 2017 (r323085)
@@ -44,7 +44,7 @@ mounts=15 # Number of parallel scripts
if [ $# -eq 0 ]; then
kldstat -v | grep -q zfs.ko || { kldload zfs.ko ||
exit 0; loaded=1; }
- zpool list | egrep -q "^tank" && zpool destroy tank
+ zpool list | egrep -q "^stress2_tank" && zpool destroy stress2_tank
u1=$mdstart
u2=$((u1 + 1))
@@ -58,11 +58,11 @@ if [ $# -eq 0 ]; then
mdconfig -s 512m -u $u2
mdconfig -s 512m -u $u3
- zpool create tank raidz md$u1 md$u2 md$u3
+ zpool create stress2_tank raidz md$u1 md$u2 md$u3
for i in `jot $mounts`; do
- zfs create tank/test$i
- zfs umount tank/test$i
+ zfs create stress2_tank/test$i
+ zfs umount stress2_tank/test$i
done
# start the parallel tests
@@ -74,7 +74,7 @@ if [ $# -eq 0 ]; then
wait
- zpool destroy tank
+ zpool destroy stress2_tank
mdconfig -d -u $u1
mdconfig -d -u $u2
mdconfig -d -u $u3
@@ -82,14 +82,14 @@ if [ $# -eq 0 ]; then
else
if [ $1 = find ]; then
while [ -f /tmp/crossmp7.continue ]; do
- find /tank -type f > /dev/null 2>&1
+ find /stress2_tank -type f > /dev/null 2>&1
done
else
# The test: Parallel mount and unmounts
m=$1
for i in `jot 1024`; do
- zfs mount tank/test$m
- zfs umount -f tank/test$m
+ zfs mount stress2_tank/test$m
+ zfs umount -f stress2_tank/test$m
done 2>/dev/null
rm -f /tmp/crossmp7.continue
fi
Modified: user/pho/stress2/misc/zfs.sh
==============================================================================
--- user/pho/stress2/misc/zfs.sh Fri Sep 1 09:48:19 2017 (r323084)
+++ user/pho/stress2/misc/zfs.sh Fri Sep 1 11:14:30 2017 (r323085)
@@ -50,17 +50,17 @@ mdconfig -s 512m -u $u1
mdconfig -s 512m -u $u2
mdconfig -s 512m -u $u3
-zpool list | egrep -q "^tank" && zpool destroy tank
-[ -d /tank ] && rm -rf /tank
-zpool create tank raidz md$u1 md$u2 md$u3
-zfs create tank/test
+zpool list | egrep -q "^stress2_tank" && zpool destroy stress2_tank
+[ -d /stress2_tank ] && rm -rf /stress2_tank
+zpool create stress2_tank raidz md$u1 md$u2 md$u3
+zfs create stress2_tank/test
-export RUNDIR=/tank/test/stressX
+export RUNDIR=/stress2_tank/test/stressX
export runRUNTIME=20m
(cd ..; ./run.sh marcus.cfg)
-zfs destroy -r tank
-zpool destroy tank
+zfs destroy -r stress2_tank
+zpool destroy stress2_tank
mdconfig -d -u $u1
mdconfig -d -u $u2
Modified: user/pho/stress2/misc/zfs2.sh
==============================================================================
--- user/pho/stress2/misc/zfs2.sh Fri Sep 1 09:48:19 2017 (r323084)
+++ user/pho/stress2/misc/zfs2.sh Fri Sep 1 11:14:30 2017 (r323085)
@@ -53,16 +53,16 @@ mdconfig -l | grep -q md$u2 && mdconfig -d -u $u2
mdconfig -a -t vnode -f $d1 -u $u1
mdconfig -a -t vnode -f $d2 -u $u2
-zpool list | egrep -q "^tank" && zpool destroy tank
-[ -d /tank ] && rm -rf /tank
-zpool create tank mirror md$u1 md$u2
+zpool list | egrep -q "^stress2_tank" && zpool destroy stress2_tank
+[ -d /stress2_tank ] && rm -rf /stress2_tank
+zpool create stress2_tank mirror md$u1 md$u2
-export RUNDIR=/tank/stressX
+export RUNDIR=/stress2_tank/stressX
export runRUNTIME=10m
(cd ..; ./run.sh marcus.cfg)
-zfs destroy -r tank
-zpool destroy tank
+zfs destroy -r stress2_tank
+zpool destroy stress2_tank
mdconfig -d -u $u1
mdconfig -d -u $u2
Modified: user/pho/stress2/misc/zfs3.sh
==============================================================================
--- user/pho/stress2/misc/zfs3.sh Fri Sep 1 09:48:19 2017 (r323084)
+++ user/pho/stress2/misc/zfs3.sh Fri Sep 1 11:14:30 2017 (r323085)
@@ -59,22 +59,22 @@ mdconfig -l | grep -q md$u2 && mdconfig -d -u $u2
mdconfig -a -t vnode -f $d1 -u $u1
mdconfig -a -t vnode -f $d2 -u $u2
-zpool list | egrep -q "^tank" && zpool destroy tank
-[ -d /tank ] && rm -rf /tank
-zpool create tank md$u1 md$u2
-zfs create tank/test
-zfs set quota=800m tank/test
-zfs snapshot tank/test at snap1
+zpool list | egrep -q "^stress2_tank" && zpool destroy stress2_tank
+[ -d /stress2_tank ] && rm -rf /stress2_tank
+zpool create stress2_tank md$u1 md$u2
+zfs create stress2_tank/test
+zfs set quota=800m stress2_tank/test
+zfs snapshot stress2_tank/test at snap1
-export RUNDIR=/tank/test/stressX
+export RUNDIR=/stress2_tank/test/stressX
export runRUNTIME=10m
(cd ..; ./run.sh marcus.cfg)
-zfs rollback tank/test at snap1
-zfs destroy tank/test at snap1
+zfs rollback stress2_tank/test at snap1
+zfs destroy stress2_tank/test at snap1
-zfs destroy -r tank
-zpool destroy tank
+zfs destroy -r stress2_tank
+zpool destroy stress2_tank
mdconfig -d -u $u1
mdconfig -d -u $u2
Modified: user/pho/stress2/misc/zfs4.sh
==============================================================================
--- user/pho/stress2/misc/zfs4.sh Fri Sep 1 09:48:19 2017 (r323084)
+++ user/pho/stress2/misc/zfs4.sh Fri Sep 1 11:14:30 2017 (r323085)
@@ -53,27 +53,27 @@ mdconfig -l | grep -q md$u2 && mdconfig -d -u $u2
mdconfig -a -t vnode -f $d1 -u $u1
mdconfig -a -t vnode -f $d2 -u $u2
-zpool list | egrep -q "^tank" && zpool destroy tank
-[ -d /tank ] && rm -rf /tank
-zpool create tank md$u1 md$u2
-zfs create tank/test
-zfs set quota=100m tank/test
-zfs set snapdir=visible tank/test
+zpool list | egrep -q "^stress2_tank" && zpool destroy stress2_tank
+[ -d /stress2_tank ] && rm -rf /stress2_tank
+zpool create stress2_tank md$u1 md$u2
+zfs create stress2_tank/test
+zfs set quota=100m stress2_tank/test
+zfs set snapdir=visible stress2_tank/test
-export RUNDIR=/tank/test/stressX
+export RUNDIR=/stress2_tank/test/stressX
export runRUNTIME=10m
(cd ..; ./run.sh marcus.cfg) &
for i in `jot 20`; do
- zfs snapshot tank/test at snap$i
+ zfs snapshot stress2_tank/test at snap$i
done
for i in `jot 20`; do
- zfs destroy tank/test at snap$i
+ zfs destroy stress2_tank/test at snap$i
done
wait
-zfs destroy -r tank
-zpool destroy tank
+zfs destroy -r stress2_tank
+zpool destroy stress2_tank
mdconfig -d -u $u1
mdconfig -d -u $u2
Modified: user/pho/stress2/misc/zfs5.sh
==============================================================================
--- user/pho/stress2/misc/zfs5.sh Fri Sep 1 09:48:19 2017 (r323084)
+++ user/pho/stress2/misc/zfs5.sh Fri Sep 1 11:14:30 2017 (r323085)
@@ -44,28 +44,28 @@ d2=$diskimage.2
dd if=/dev/zero of=$d1 bs=1m count=1k 2>&1 | egrep -v "records|transferred"
dd if=/dev/zero of=$d2 bs=1m count=1k 2>&1 | egrep -v "records|transferred"
-zpool list | egrep -q "^tank" && zpool destroy tank
-[ -d /tank ] && rm -rf /tank
-zpool create tank $d1 $d2
-zfs create tank/test
-zfs set quota=100m tank/test
+zpool list | egrep -q "^stress2_tank" && zpool destroy stress2_tank
+[ -d /stress2_tank ] && rm -rf /stress2_tank
+zpool create stress2_tank $d1 $d2
+zfs create stress2_tank/test
+zfs set quota=100m stress2_tank/test
-export RUNDIR=/tank/test/stressX
+export RUNDIR=/stress2_tank/test/stressX
export runRUNTIME=10m
(cd ..; ./run.sh vfs.cfg) &
for i in `jot 20`; do
- zfs snapshot tank/test at snap$i
- zfs clone tank/test at snap$i tank/snap$i
+ zfs snapshot stress2_tank/test at snap$i
+ zfs clone stress2_tank/test at snap$i stress2_tank/snap$i
done
for i in `jot 20`; do
- zfs destroy tank/snap$i
- zfs destroy tank/test at snap$i
+ zfs destroy stress2_tank/snap$i
+ zfs destroy stress2_tank/test at snap$i
done
wait
-zfs destroy -r tank
-zpool destroy tank
+zfs destroy -r stress2_tank
+zpool destroy stress2_tank
rm -rf $d1 $d2
[ -n "$loaded" ] && kldunload zfs.ko
Modified: user/pho/stress2/misc/zfs6.sh
==============================================================================
--- user/pho/stress2/misc/zfs6.sh Fri Sep 1 09:48:19 2017 (r323084)
+++ user/pho/stress2/misc/zfs6.sh Fri Sep 1 11:14:30 2017 (r323085)
@@ -51,27 +51,27 @@ mdconfig -s 512m -u $u1
mdconfig -s 512m -u $u2
mdconfig -s 512m -u $u3
-zpool list | egrep -q "^tank" && zpool destroy tank
-[ -d /tank ] && rm -rf /tank
-zpool create tank raidz md$u1 md$u2 md$u3 || exit 1
-zfs create tank/test || exit 1
+zpool list | egrep -q "^stress2_tank" && zpool destroy stress2_tank
+[ -d /stress2_tank ] && rm -rf /stress2_tank
+zpool create stress2_tank raidz md$u1 md$u2 md$u3 || exit 1
+zfs create stress2_tank/test || exit 1
while true; do
- zfs umount tank/test
- zfs mount tank/test
+ zfs umount stress2_tank/test
+ zfs mount stress2_tank/test
done &
for i in `jot 5000`; do
- touch /tank/test/f$i
- zfs snapshot tank/test@$i
+ touch /stress2_tank/test/f$i
+ zfs snapshot stress2_tank/test@$i
if [ $i -gt 5 ]; then
- zfs destroy tank/test@$((i - 5))
+ zfs destroy stress2_tank/test@$((i - 5))
fi
done
kill $!
wait
-zfs destroy -r tank
-zpool destroy tank
+zfs destroy -r stress2_tank
+zpool destroy stress2_tank
mdconfig -d -u $u1
mdconfig -d -u $u2
More information about the svn-src-user
mailing list