From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 409 invoked by alias); 4 Mar 2011 15:04:09 -0000 Received: (qmail 391 invoked by uid 9664); 4 Mar 2011 15:04:09 -0000 Date: Fri, 04 Mar 2011 15:04:00 -0000 Message-ID: <20110304150409.389.qmail@sourceware.org> From: mbroz@sourceware.org To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org Subject: LVM2/test t-lock-blocking.sh Mailing-List: contact lvm2-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: lvm2-cvs-owner@sourceware.org X-SW-Source: 2011-03/txt/msg00026.txt.bz2 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