Message ID | 151683801556.17051.2037237512407215800.stgit@magnolia (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Wed, Jan 24, 2018 at 03:53:35PM -0800, Darrick J. Wong wrote: > From: Darrick J. Wong <darrick.wong@oracle.com> > > Use a runfile presence check to control the background getfattr loop > instead of using kill -9. This helps us to avoid the problem that > the controlling bash will print a process killed message, which wrecks > the golden output. > > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> I saw this failure in automatic fstests runs occasionally, but could never reproduce it manually. Thanks for fixing it! > --- > tests/generic/403 | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > > diff --git a/tests/generic/403 b/tests/generic/403 > index 17897ff..18fd1e5 100755 > --- a/tests/generic/403 > +++ b/tests/generic/403 > @@ -61,7 +61,9 @@ touch $SCRATCH_MNT/file > $SETFATTR_PROG -n trusted.small -v a $SCRATCH_MNT/file > > # start a background getxattr loop for the existing xattr > -while [ true ]; do > +runfile="$tmp.getfattr" > +touch $runfile > +while [ -e $runfile ]; do > $GETFATTR_PROG --absolute-names -n trusted.small $SCRATCH_MNT/file \ > > /dev/null || break > done & > @@ -75,7 +77,7 @@ for i in $(seq 0 99); do > $SETFATTR_PROG -x trusted.big $SCRATCH_MNT/file > done > > -kill -9 $getfattr_pid > /dev/null 2>&1 > +rm -rf $runfile I changed it to 'rm -f $runfile', dropped '-r'. Thanks, Eryu > wait > /dev/null 2>&1 > > echo Silence is golden > -- To unsubscribe from this list: send the line "unsubscribe fstests" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/tests/generic/403 b/tests/generic/403 index 17897ff..18fd1e5 100755 --- a/tests/generic/403 +++ b/tests/generic/403 @@ -61,7 +61,9 @@ touch $SCRATCH_MNT/file $SETFATTR_PROG -n trusted.small -v a $SCRATCH_MNT/file # start a background getxattr loop for the existing xattr -while [ true ]; do +runfile="$tmp.getfattr" +touch $runfile +while [ -e $runfile ]; do $GETFATTR_PROG --absolute-names -n trusted.small $SCRATCH_MNT/file \ > /dev/null || break done & @@ -75,7 +77,7 @@ for i in $(seq 0 99); do $SETFATTR_PROG -x trusted.big $SCRATCH_MNT/file done -kill -9 $getfattr_pid > /dev/null 2>&1 +rm -rf $runfile wait > /dev/null 2>&1 echo Silence is golden