LVM2/test t-lock-blocking.sh

LVM2/test t-lock-blocking.sh

[mbroz]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	mbroz@sourceware.org	2011-03-04 15:04:08

Modified files:
	test           : t-lock-blocking.sh 

Log message:
	Make the lock test a little bit better...

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/t-lock-blocking.sh.diff?cvsroot=lvm2&r1=1.5&r2=1.6

--- LVM2/test/t-lock-blocking.sh	2011/03/03 16:04:53	1.5
+++ LVM2/test/t-lock-blocking.sh	2011/03/04 15:04:08	1.6
@@ -21,17 +21,21 @@
 # if wait_for_locks set, vgremove should wait for orphan lock
 # flock process should have exited by the time first vgremove completes
 flock -w 5 $TESTDIR/var/lock/lvm/P_orphans -c "sleep 10" &
-flock_pid=`jobs -p`
+while ! test -f $TESTDIR/var/lock/lvm/P_orphans ; do sleep .1 ; done
+
 vgremove --config 'global { wait_for_locks = 1 }' $vg
 not vgremove --config 'global { wait_for_locks = 1 }' $vg
-sleep .2 # leave some time for scheduler to exit flock process
-not ps $flock_pid # finished
+
+test ! -f $TESTDIR/var/lock/lvm/P_orphans
 
 # if wait_for_locks not set, vgremove should fail on non-blocking lock
 # we must wait for flock process at the end - vgremove won't wait
 vgcreate $vg $dev1 $dev2
 flock -w 5 $TESTDIR/var/lock/lvm/P_orphans -c "sleep 10" &
+
+while ! test -f $TESTDIR/var/lock/lvm/P_orphans ; do sleep .1 ; done
 flock_pid=`jobs -p`
+
 not vgremove --config 'global { wait_for_locks = 0 }' $vg
-ps $flock_pid # still running
+test -f $TESTDIR/var/lock/lvm/P_orphans # still running
 kill $flock_pid

LVM2/test t-lock-blocking.sh

[zkabelac]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	zkabelac@sourceware.org	2011-03-03 16:04:54

Modified files:
	test           : t-lock-blocking.sh 

Log message:
	Leave some time to scheduler
	
	Looks like scheduler prefers running task before exiting tasks.
	So leave some time to finish running flock process.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/t-lock-blocking.sh.diff?cvsroot=lvm2&r1=1.4&r2=1.5

--- LVM2/test/t-lock-blocking.sh	2011/01/13 11:05:27	1.4
+++ LVM2/test/t-lock-blocking.sh	2011/03/03 16:04:53	1.5
@@ -24,6 +24,7 @@
 flock_pid=`jobs -p`
 vgremove --config 'global { wait_for_locks = 1 }' $vg
 not vgremove --config 'global { wait_for_locks = 1 }' $vg
+sleep .2 # leave some time for scheduler to exit flock process
 not ps $flock_pid # finished
 
 # if wait_for_locks not set, vgremove should fail on non-blocking lock

LVM2/test t-lock-blocking.sh

[zkabelac]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	zkabelac@sourceware.org	2011-01-13 11:05:27

Modified files:
	test           : t-lock-blocking.sh 

Log message:
	Check for file with clvmd pid
	
	Instead of checking  $LOCAL_CLVMD set during some 'aux' execution which
	doesn't seem to be propagated to this shell - check for existance of pid
	file of clvmd process - so this test is skipped in singlenode cluster test.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/t-lock-blocking.sh.diff?cvsroot=lvm2&r1=1.3&r2=1.4

--- LVM2/test/t-lock-blocking.sh	2011/01/05 00:16:20	1.3
+++ LVM2/test/t-lock-blocking.sh	2011/01/13 11:05:27	1.4
@@ -14,7 +14,7 @@
 . lib/test
 
 aux prepare_devs 3
-test -n "$LOCAL_CLVMD" && exit 200
+test -e LOCAL_CLVMD && exit 200
 pvcreate $dev1 $dev2
 vgcreate $vg $dev1 $dev2
 

LVM2/test t-lock-blocking.sh

[zkabelac]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	zkabelac@sourceware.org	2010-08-02 13:23:02

Modified files:
	test           : t-lock-blocking.sh 

Log message:
	Minor speedup of lock test -
	Instead of waiting for flock process finish kill the flock process.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/t-lock-blocking.sh.diff?cvsroot=lvm2&r1=1.1&r2=1.2

--- LVM2/test/t-lock-blocking.sh	2010/06/24 07:57:54	1.1
+++ LVM2/test/t-lock-blocking.sh	2010/08/02 13:23:01	1.2
@@ -33,4 +33,4 @@
 flock_pid=`jobs -p`
 not vgremove --config 'global { wait_for_locks = 0 }' $vg
 ps $flock_pid # still running
-wait $flock_pid
+kill $flock_pid

LVM2/test t-lock-blocking.sh

[mornfall]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	mornfall@sourceware.org	2010-06-24 07:57:55

Added files:
	test           : t-lock-blocking.sh 

Log message:
	Add a test of wait_for_locks behaviour (adapted from an original by Dave).

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/t-lock-blocking.sh.diff?cvsroot=lvm2&r1=NONE&r2=1.1

/cvs/lvm2/LVM2/test/t-lock-blocking.sh,v  -->  standard output
revision 1.1
--- LVM2/test/t-lock-blocking.sh
+++ -	2010-06-24 07:57:55.268963000 +0000
@@ -0,0 +1,36 @@
+#!/bin/sh
+# Copyright (C) 2008 Red Hat, Inc. All rights reserved.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions
+# of the GNU General Public License v.2.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+test_description='test some blocking / non-blocking multi-vg operations'
+
+. ./test-utils.sh
+
+aux prepare_devs 3
+test -n "$LOCAL_CLVMD" && exit 200
+pvcreate $dev1 $dev2
+vgcreate $vg $dev1 $dev2
+
+# if wait_for_locks set, vgremove should wait for orphan lock
+# flock process should have exited by the time first vgremove completes
+flock -w 5 $TESTDIR/var/lock/lvm/P_orphans -c "sleep 10" &
+flock_pid=`jobs -p`
+vgremove --config 'global { wait_for_locks = 1 }' $vg
+not vgremove --config 'global { wait_for_locks = 1 }' $vg
+not ps $flock_pid # finished
+
+# if wait_for_locks not set, vgremove should fail on non-blocking lock
+# we must wait for flock process at the end - vgremove won't wait
+vgcreate $vg $dev1 $dev2
+flock -w 5 $TESTDIR/var/lock/lvm/P_orphans -c "sleep 10" &
+flock_pid=`jobs -p`
+not vgremove --config 'global { wait_for_locks = 0 }' $vg
+ps $flock_pid # still running
+wait $flock_pid