On Thu, Nov 28, 2013 at 04:05:44PM +0800, Zheng Liu wrote:
> From: Zheng Liu <wenqing.lz@xxxxxxxxxx>
>
> In this commit a new test case is added to test that i_size is updated
> properly under dio reads/writes. We add a program in /src dir, which
> has a writer to issue some append dio writes. Meanwhile it has a
> reader in this test do some dio reads. As we expect, reader should read
> nothing or data with 'a'. But it might read some data with '0'.
>
> This program is used to simulate binary log operations of database
> application. In these applications it implements an master/slave
> synchronziation for database.
>
> Cc: Christoph Hellwig <hch@xxxxxxxxxxxxx>
> Cc: Rich Johnston <rjohnston@xxxxxxx>
> Cc: Dave Chinner <david@xxxxxxxxxxxxx>
> Signed-off-by: Zheng Liu <wenqing.lz@xxxxxxxxxx>
Any comment?
Thanks,
- Zheng
> ---
> changelog v2:
> * add '-lpthread' into LLDLIBS
>
> aclocal.m4 | 1 +
> configure.ac | 1 +
> include/builddefs.in | 1 +
> src/Makefile | 4 +-
> src/diotest.c | 166 +++++++++++++++++++++++++++++++++++++++++++++++++
> tests/generic/321 | 56 +++++++++++++++++
> tests/generic/321.out | 1 +
> tests/generic/group | 1 +
> 8 files changed, 229 insertions(+), 2 deletions(-)
> create mode 100644 src/diotest.c
> create mode 100755 tests/generic/321
> create mode 100644 tests/generic/321.out
>
> diff --git a/aclocal.m4 b/aclocal.m4
> index f3412e1..89bb816 100644
> --- a/aclocal.m4
> +++ b/aclocal.m4
> @@ -44,6 +44,7 @@ m4_include([m4/package_attrdev.m4])
> m4_include([m4/package_dmapidev.m4])
> m4_include([m4/package_gdbmdev.m4])
> m4_include([m4/package_globals.m4])
> +m4_include([m4/package_pthread.m4])
> m4_include([m4/package_ssldev.m4])
> m4_include([m4/package_utilies.m4])
> m4_include([m4/package_uuiddev.m4])
> diff --git a/configure.ac b/configure.ac
> index bd48fd9..5eba21a 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -62,6 +62,7 @@ in
> AC_PACKAGE_NEED_SYS_ACL_H
> AC_PACKAGE_NEED_ACL_LIBACL_H
> AC_PACKAGE_NEED_ACLINIT_LIBACL
> + AC_PACKAGE_NEED_PTHREADMUTEXINIT
>
> AC_PACKAGE_WANT_GDBM
> AC_PACKAGE_WANT_AIO
> diff --git a/include/builddefs.in b/include/builddefs.in
> index 24f838f..d612ac1 100644
> --- a/include/builddefs.in
> +++ b/include/builddefs.in
> @@ -23,6 +23,7 @@ LIBGDBM = @libgdbm@
> LIBUUID = @libuuid@
> LIBHANDLE = @libhdl@
> LIBDM = @libdm@
> +LIBPTHREAD = @libpthread@
> LIBTEST = $(TOPDIR)/lib/libtest.la
>
> PKG_NAME = @pkg_name@
> diff --git a/src/Makefile b/src/Makefile
> index 84c8297..f0fa9b9 100644
> --- a/src/Makefile
> +++ b/src/Makefile
> @@ -18,11 +18,11 @@ LINUX_TARGETS = xfsctl bstat t_mtab getdevicesize preallo_rw_pattern_reader \
> locktest unwritten_mmap bulkstat_unlink_test t_stripealign \
> bulkstat_unlink_test_modified t_dir_offset t_futimens t_immutable \
> stale_handle pwrite_mmap_blocked t_dir_offset2 seek_sanity_test \
> - seek_copy_test t_readdir_1 t_readdir_2 fsync-tester nsexec
> + seek_copy_test t_readdir_1 t_readdir_2 fsync-tester nsexec diotest
>
> SUBDIRS =
>
> -LLDLIBS = $(LIBATTR) $(LIBHANDLE) $(LIBACL)
> +LLDLIBS = $(LIBATTR) $(LIBHANDLE) $(LIBACL) $(LIBPTHREAD)
>
> ifeq ($(HAVE_XLOG_ASSIGN_LSN), true)
> LINUX_TARGETS += loggen
> diff --git a/src/diotest.c b/src/diotest.c
> new file mode 100644
> index 0000000..7d2378f
> --- /dev/null
> +++ b/src/diotest.c
> @@ -0,0 +1,166 @@
> +/*
> + * Copyright (c) 2013 Alibaba Group.
> + * All Rights Reserved.
> + *
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License as
> + * published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope that it would be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write the Free Software Foundation,
> + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
> + */
> +
> +/*
> + * This is a normal case that we do some append dio writes and meanwhile
> + * we do some dio reads. Currently in vfs we don't ensure that i_size
> + * is updated properly. Hence the reader will read some data with '0'.
> + * But we expect that the reader should read nothing or data with 'a'.
> + */
> +
> +#include <stdio.h>
> +#include <stdlib.h>
> +#include <string.h>
> +
> +#include <unistd.h>
> +#include <sys/types.h>
> +#include <sys/stat.h>
> +#include <fcntl.h>
> +#include <errno.h>
> +
> +#include <pthread.h>
> +
> +static char *prog;
> +
> +struct writer_data {
> + int fd;
> + size_t blksize;
> + char *buf;
> +};
> +
> +static void usage(void)
> +{
> + fprintf(stderr, "usage: %s [FILE]\n", prog);
> +}
> +
> +static void *writer(void *arg)
> +{
> + struct writer_data *data = (struct writer_data *)arg;
> + int ret;
> +
> + ret = write(data->fd, data->buf, data->blksize);
> + if (ret < 0)
> + fprintf(stderr, "write file failed: %s\n", strerror(errno));
> +
> + return NULL;
> +}
> +
> +int main(int argc, char *argv[])
> +{
> + pthread_t tid;
> + struct writer_data wdata;
> + size_t max_blocks = 128; /* 128 */
> + size_t blksize = 1 * 1024 * 1024; /* 1M */
> + char *rbuf = NULL, *wbuf = NULL;
> + int rfd = 0, wfd = 0;
> + int i, j;
> + int ret = 0;
> +
> + prog = basename(argv[0]);
> +
> + if (argc != 2) {
> + usage();
> + exit(1);
> + }
> +
> + wfd = open(argv[1], O_CREAT|O_DIRECT|O_WRONLY|O_APPEND|O_TRUNC, S_IRWXU);
> + if (wfd < 0) {
> + fprintf(stderr, "failed to open write file: %s\n",
> + strerror(errno));
> + exit(1);
> + }
> +
> + rfd = open(argv[1], O_DIRECT|O_RDONLY, S_IRWXU);
> + if (wfd < 0) {
> + fprintf(stderr, "failed to open read file: %s\n",
> + strerror(errno));
> + ret = 1;
> + goto err;
> + }
> +
> + /*
> + * We set 1024 as an alignment size for write buf. Feel free to change
> + * it with 4096. But the problem is also hitted.
> + */
> + if (posix_memalign((void **)&wbuf, 1024, blksize)) {
> + fprintf(stderr, "failed to alloc memory: %s\n", strerror(errno));
> + ret = 1;
> + goto err;
> + }
> +
> + if (posix_memalign((void **)&rbuf, 4096, blksize)) {
> + fprintf(stderr, "failed to alloc memory: %s\n", strerror(errno));
> + ret = 1;
> + goto err;
> + }
> +
> + memset(wbuf, 'a', blksize);
> + wdata.fd = wfd;
> + wdata.blksize = blksize;
> + wdata.buf = wbuf;
> +
> + for (i = 0; i < max_blocks; i++) {
> + void *retval;
> +
> + if (pthread_create(&tid, NULL, writer, &wdata)) {
> + fprintf(stderr, "create thread failed: %s\n",
> + strerror(errno));
> + ret = 1;
> + goto err;
> + }
> +
> + memset(rbuf, 'b', blksize);
> + do {
> + ret = pread(rfd, rbuf, blksize, i * blksize);
> + if (ret < 0)
> + fprintf(stderr, "read file failed: %s\n",
> + strerror(errno));
> + } while (ret <= 0);
> +
> + if (pthread_join(tid, &retval)) {
> + fprintf(stderr, " pthread join failed: %s\n",
> + strerror(errno));
> + ret = 1;
> + goto err;
> + }
> +
> + if (ret >= 0) {
> + for (j = 0; j < ret; j ++) {
> + if (rbuf[j] != 'a') {
> + fprintf(stderr, "encounter an error: "
> + "offset %d content %c\n",
> + i, rbuf[j]);
> + ret = 1;
> + goto err;
> + }
> + }
> + }
> + }
> +
> +err:
> + if (rfd)
> + close(rfd);
> + if (wfd)
> + close(wfd);
> + if (rbuf)
> + free(rbuf);
> + if (wbuf)
> + free(wbuf);
> +
> + return ret;
> +}
> diff --git a/tests/generic/321 b/tests/generic/321
> new file mode 100755
> index 0000000..372d23a
> --- /dev/null
> +++ b/tests/generic/321
> @@ -0,0 +1,56 @@
> +#! /bin/bash
> +# FS QA Test No. 321
> +#
> +# Test i_size is updated properly under dio read/write
> +#
> +#-----------------------------------------------------------------------
> +# Copyright (c) 2013 Alibaba Group. All Rights Reserved.
> +#
> +# This program is free software; you can redistribute it and/or
> +# modify it under the terms of the GNU General Public License as
> +# published by the Free Software Foundation.
> +#
> +# This program is distributed in the hope that it would be useful,
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> +# GNU General Public License for more details.
> +#
> +# You should have received a copy of the GNU General Public License
> +# along with this program; if not, write the Free Software Foundation,
> +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
> +#-----------------------------------------------------------------------
> +#
> +
> +seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> +echo "QA output created by $seq"
> +
> +here=`pwd`
> +tmp=/tmp/$$
> +status=1 # failure is the default!
> +trap "_cleanup; exit \$status" 0 1 2 3 15
> +
> +_cleanup()
> +{
> + cd /
> + rm -f $tmp.* $testfile
> +}
> +
> +# get standard environment, filters and checks
> +. ./common/rc
> +. ./common/filter
> +
> +# real QA test starts here
> +_supported_fs generic
> +_supported_os Linux
> +
> +testfile=$TEST_DIR/$seq.$$
> +
> +[ -x $here/src/diotest ] || _notrun "diotest not built"
> +
> +$here/src/diotest $testfile > $seqres.full 2>&1 ||
> + _fail "i_size isn't update properly!"
> +
> +# success, all done
> +status=0
> +exit
> diff --git a/tests/generic/321.out b/tests/generic/321.out
> new file mode 100644
> index 0000000..0cda9e4
> --- /dev/null
> +++ b/tests/generic/321.out
> @@ -0,0 +1 @@
> +QA output created by 321
> diff --git a/tests/generic/group b/tests/generic/group
> index 40da6dc..0b86d9f 100644
> --- a/tests/generic/group
> +++ b/tests/generic/group
> @@ -123,3 +123,4 @@
> 318 acl attr auto quick
> 319 acl auto quick
> 320 auto rw
> +321 auto rw quick
> --
> 1.7.9.7
>
_______________________________________________
xfs mailing list
xfs@xxxxxxxxxxx
http://oss.sgi.com/mailman/listinfo/xfs
