| Message ID | 1435943727-6075-1-git-send-email-xuw2015@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sat, Jul 04, 2015 at 01:15:27AM +0800, xuw2015@gmail.com wrote: > From: George Wang <xuw2015@gmail.com> Looks good to me overall, some comments below. How about changing subject to: xfs/015: make sure create_file finishes after growfs > > create_file may run over before growfs, which depends on many reasons. such as > the schedule algorithm, the workload of testing machine, etc. we should always > make sure the create_file run over after growfs, then we can get the valid > result of this test. Missing "Signed-off-by" line here. > --- > tests/xfs/015 | 16 +++++++++++++--- > 1 file changed, 13 insertions(+), 3 deletions(-) > > diff --git a/tests/xfs/015 b/tests/xfs/015 > index 4dbf38a..d9d4446 100755 > --- a/tests/xfs/015 > +++ b/tests/xfs/015 > @@ -43,9 +43,16 @@ create_file() > { > local dir=$1 > local i=0 > - > - while echo -n >$dir/testfile_$i; do > - let i=$i+1 > + local in_growfs=false > + > + # keep run until failed after growfs ^^^ running Thanks, Eryu > + while true; do > + [ -f $tmp.growfs ] && in_growfs=true > + while echo -n >$dir/testfile_$i; do > + let i=$i+1 > + done > + $in_growfs && break > + usleep 1000 > done > } > > @@ -89,6 +96,9 @@ echo "Fork $nr_worker workers to consume free inodes in background" >>$seqres.fu > echo "Grow fs to $((dblocks * 4)) blocks" >>$seqres.full > $XFS_GROWFS_PROG -D $((dblocks * 4)) $SCRATCH_MNT >>$seqres.full > > +# mark xfs_growfs finished to create_file > +touch $tmp.growfs > + > # Wait for background create_file to hit ENOSPC > wait > > -- > 1.8.4.2 > > -- > 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 -- 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/xfs/015 b/tests/xfs/015 index 4dbf38a..d9d4446 100755 --- a/tests/xfs/015 +++ b/tests/xfs/015 @@ -43,9 +43,16 @@ create_file() { local dir=$1 local i=0 - - while echo -n >$dir/testfile_$i; do - let i=$i+1 + local in_growfs=false + + # keep run until failed after growfs + while true; do + [ -f $tmp.growfs ] && in_growfs=true + while echo -n >$dir/testfile_$i; do + let i=$i+1 + done + $in_growfs && break + usleep 1000 done } @@ -89,6 +96,9 @@ echo "Fork $nr_worker workers to consume free inodes in background" >>$seqres.fu echo "Grow fs to $((dblocks * 4)) blocks" >>$seqres.full $XFS_GROWFS_PROG -D $((dblocks * 4)) $SCRATCH_MNT >>$seqres.full +# mark xfs_growfs finished to create_file +touch $tmp.growfs + # Wait for background create_file to hit ENOSPC wait
From: George Wang <xuw2015@gmail.com> create_file may run over before growfs, which depends on many reasons. such as the schedule algorithm, the workload of testing machine, etc. we should always make sure the create_file run over after growfs, then we can get the valid result of this test. --- tests/xfs/015 | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)