svn commit: r342044 - user/pho/stress2/misc

[Peter Holm]

Author: pho
Date: Thu Dec 13 11:55:18 2018
New Revision: 342044
URL: https://svnweb.freebsd.org/changeset/base/342044

Log:
  Wait for the mirror name to appear in /dev/mirror if
  launch_mirror_before_timeout is" 0".
  
  Sponsored by:	Dell EMC Isilon

Modified:
  user/pho/stress2/misc/graid1.sh
  user/pho/stress2/misc/graid1_10.sh
  user/pho/stress2/misc/graid1_2.sh
  user/pho/stress2/misc/graid1_4.sh
  user/pho/stress2/misc/graid1_5.sh
  user/pho/stress2/misc/graid1_6.sh
  user/pho/stress2/misc/graid1_7.sh
  user/pho/stress2/misc/graid1_9.sh

Modified: user/pho/stress2/misc/graid1.sh
==============================================================================
--- user/pho/stress2/misc/graid1.sh	Thu Dec 13 11:49:12 2018	(r342043)
+++ user/pho/stress2/misc/graid1.sh	Thu Dec 13 11:55:18 2018	(r342044)
@@ -54,6 +54,8 @@ sysctl kern.geom.mirror.debug=-1 | grep -q -- -1 ||
     sysctl kern.geom.mirror.debug=$old > /dev/null
 gmirror label -v -b split -s 2048 data /dev/md$md1 /dev/md$md2 \
     /dev/md$md3 > /dev/null || exit 1
+[ "`sysctl -in kern.geom.mirror.launch_mirror_before_timeout`" = "0" ] &&
+    sleep $((`sysctl -n kern.geom.mirror.timeout` + 1))
 [ -c /dev/mirror/data ] || exit 1
 newfs $newfs_flags /dev/mirror/data > /dev/null
 mount /dev/mirror/data $mntpoint

Modified: user/pho/stress2/misc/graid1_10.sh
==============================================================================
--- user/pho/stress2/misc/graid1_10.sh	Thu Dec 13 11:49:12 2018	(r342043)
+++ user/pho/stress2/misc/graid1_10.sh	Thu Dec 13 11:55:18 2018	(r342044)
@@ -55,6 +55,8 @@ sysctl kern.geom.mirror.debug=-1 | grep -q -- -1 ||
     sysctl kern.geom.mirror.debug=$old > /dev/null
 gmirror label -v -b split -s 2048 test /dev/md$md1 /dev/md$md2 \
     > /dev/null || exit 1
+[ "`sysctl -in kern.geom.mirror.launch_mirror_before_timeout`" = "0" ] &&
+    sleep $((`sysctl -n kern.geom.mirror.timeout` + 1))
 [ -c /dev/mirror/test ] || exit 1
 newfs /dev/mirror/test > /dev/null
 mount /dev/mirror/test $mntpoint

Modified: user/pho/stress2/misc/graid1_2.sh
==============================================================================
--- user/pho/stress2/misc/graid1_2.sh	Thu Dec 13 11:49:12 2018	(r342043)
+++ user/pho/stress2/misc/graid1_2.sh	Thu Dec 13 11:55:18 2018	(r342044)
@@ -62,6 +62,8 @@ for u in $md1 $md2; do
 	mdconfig -a -t vnode -f /tmp/graid1_2_di$u -u $u
 done
 gmirror label test /dev/md$md1 /dev/md$md2 || exit 1
+[ "`sysctl -in kern.geom.mirror.launch_mirror_before_timeout`" = "0" ] &&
+    sleep $((`sysctl -n kern.geom.mirror.timeout` + 1))
 [ -c /dev/mirror/test ] || exit 1
 
 for i in `jot 150`; do /tmp/graid1_2 /dev/mirror/test; done &

Modified: user/pho/stress2/misc/graid1_4.sh
==============================================================================
--- user/pho/stress2/misc/graid1_4.sh	Thu Dec 13 11:49:12 2018	(r342043)
+++ user/pho/stress2/misc/graid1_4.sh	Thu Dec 13 11:55:18 2018	(r342044)
@@ -63,6 +63,8 @@ done
 
 gmirror label -v -b split -s 2048 test /dev/md$md1 /dev/md$md2 \
     > /dev/null || exit 1
+[ "`sysctl -in kern.geom.mirror.launch_mirror_before_timeout`" = "0" ] &&
+    sleep $((`sysctl -n kern.geom.mirror.timeout` + 1))
 [ -c /dev/mirror/test ] || exit 1
 # Soft Updates issues with removal of backing media
 newfs /dev/mirror/test > /dev/null

Modified: user/pho/stress2/misc/graid1_5.sh
==============================================================================
--- user/pho/stress2/misc/graid1_5.sh	Thu Dec 13 11:49:12 2018	(r342043)
+++ user/pho/stress2/misc/graid1_5.sh	Thu Dec 13 11:55:18 2018	(r342044)
@@ -64,6 +64,8 @@ gpart add -t freebsd-ufs -s 340m md$u3
 gnop create md$u2
 gnop create md$u3
 gmirror label test md${u1}p1 md$u2.nopp1 md$u3.nopp1
+[ "`sysctl -in kern.geom.mirror.launch_mirror_before_timeout`" = "0" ] &&
+    sleep $((`sysctl -n kern.geom.mirror.timeout` + 1))
 [ -c /dev/mirror/test ] || exit 1
 
 newfs /dev/mirror/test > /dev/null

Modified: user/pho/stress2/misc/graid1_6.sh
==============================================================================
--- user/pho/stress2/misc/graid1_6.sh	Thu Dec 13 11:49:12 2018	(r342043)
+++ user/pho/stress2/misc/graid1_6.sh	Thu Dec 13 11:55:18 2018	(r342044)
@@ -59,6 +59,8 @@ done
 
 gmirror label -v -b split -s 2048 test /dev/md$md1 /dev/md$md2 \
     > /dev/null || exit 1
+[ "`sysctl -in kern.geom.mirror.launch_mirror_before_timeout`" = "0" ] &&
+    sleep $((`sysctl -n kern.geom.mirror.timeout` + 1))
 [ -c /dev/mirror/test ] || exit 1
 newfs $newfs_flags /dev/mirror/test > /dev/null
 mount /dev/mirror/test $mntpoint

Modified: user/pho/stress2/misc/graid1_7.sh
==============================================================================
--- user/pho/stress2/misc/graid1_7.sh	Thu Dec 13 11:49:12 2018	(r342043)
+++ user/pho/stress2/misc/graid1_7.sh	Thu Dec 13 11:55:18 2018	(r342044)
@@ -58,6 +58,8 @@ gpart add -t freebsd-ufs -s 341m md$u1
 gpart add -t freebsd-ufs -s 341m md$u1
 ) > /dev/null
 gmirror label test md${u1}p1 md${u1}p2 md${u1}p3
+[ "`sysctl -in kern.geom.mirror.launch_mirror_before_timeout`" = "0" ] &&
+    sleep $((`sysctl -n kern.geom.mirror.timeout` + 1))
 [ -c /dev/mirror/test ] || exit 1
 
 newfs /dev/mirror/test > /dev/null

Modified: user/pho/stress2/misc/graid1_9.sh
==============================================================================
--- user/pho/stress2/misc/graid1_9.sh	Thu Dec 13 11:49:12 2018	(r342043)
+++ user/pho/stress2/misc/graid1_9.sh	Thu Dec 13 11:55:18 2018	(r342044)
@@ -59,6 +59,8 @@ sysctl kern.geom.mirror.debug=-1 | grep -q -- -1 ||
     sysctl kern.geom.mirror.debug=$old > /dev/null
 gmirror label -v -b split -s 2048 test /dev/md$md1 /dev/md$md2 \
     /dev/md$md3 > /dev/null || exit 1
+[ "`sysctl -in kern.geom.mirror.launch_mirror_before_timeout`" = "0" ] &&
+    sleep $((`sysctl -n kern.geom.mirror.timeout` + 1))
 [ -c /dev/mirror/test ] || exit 1
 # Do not use SU as it is more intolerant to FS corruption
 newfs /dev/mirror/test > /dev/null