summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAtin Mukherjee <amukherj@redhat.com>2014-11-13 07:03:54 +0530
committerVijay Bellur <vbellur@redhat.com>2014-11-19 20:34:07 -0800
commit463d3e379d63e37764bc190be6c2f790769bea58 (patch)
tree180c8d4f5e24f047d8ce4e7b31117adc8541d3b8
parentf380e2029d608f97e3ba9a728605e1d798b09e8d (diff)
tests: spurious failure fix for quota-anon-fd-nfs.t
Change-Id: I4f7ee68c514d8d322e25cf74167f288a8b6f8164 BUG: 1163543 Signed-off-by: Atin Mukherjee <amukherj@redhat.com> Reviewed-on: http://review.gluster.org/9108 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Niels de Vos <ndevos@redhat.com>
-rw-r--r--tests/basic/quota-anon-fd-nfs.c47
-rwxr-xr-xtests/basic/quota-anon-fd-nfs.t7
2 files changed, 53 insertions, 1 deletions
diff --git a/tests/basic/quota-anon-fd-nfs.c b/tests/basic/quota-anon-fd-nfs.c
new file mode 100644
index 00000000000..4cc0322e132
--- /dev/null
+++ b/tests/basic/quota-anon-fd-nfs.c
@@ -0,0 +1,47 @@
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+int
+file_write (char *filename, int filesize)
+{
+ int fd, ret = 0;
+ int i = 0;
+ char buf[1024] = {'a',};
+ fd = open (filename, O_RDWR|O_CREAT|O_APPEND, 0600);
+ while (i < filesize) {
+ ret = write(fd, buf, sizeof(buf));
+ if (ret == -1) {
+ close (fd);
+ return ret;
+ }
+ i += sizeof(buf);
+ ret = fdatasync(fd);
+ if (ret) {
+ close (fd);
+ return ret;
+ }
+ }
+ ret = close(fd);
+ if (ret)
+ return ret;
+
+ return 0;
+}
+
+int
+main (int argc, char **argv)
+{
+ if (argc != 3) {
+ printf("Usage: %s <filename> <size(in bytes)>\n", argv[0]);
+ return EXIT_FAILURE;
+ }
+
+ printf ("argv[2] is %s\n", argv[2]);
+ if (file_write (argv[1], atoi(argv[2])) == -1)
+ return EXIT_FAILURE;
+
+ return EXIT_SUCCESS;
+}
diff --git a/tests/basic/quota-anon-fd-nfs.t b/tests/basic/quota-anon-fd-nfs.t
index 25f3474bcea..0f7a9aac52e 100755
--- a/tests/basic/quota-anon-fd-nfs.t
+++ b/tests/basic/quota-anon-fd-nfs.t
@@ -39,7 +39,12 @@ TEST $CLI volume quota $V0 hard-timeout 0
TEST dd if=/dev/zero of=$N0/$deep/newfile_1 bs=512 count=10240
# wait for write behind to complete.
EXPECT_WITHIN $MARKER_UPDATE_TIMEOUT "15.0MB" usage "/"
-TEST ! dd if=/dev/zero of=$N0/$deep/newfile_2 bs=1k count=10240
+
+# compile the test write program and run it
+TEST $CC $(dirname $0)/quota-anon-fd-nfs.c -o $(dirname $0)/quota-anon-fd-nfs;
+# Try to create a 100Mb file which should fail
+TEST ! $(dirname $0)/quota-anon-fd-nfs $N0/$deep/newfile_2 "104857600"
+TEST rm -f $N0/$deep/newfile_2
## Before killing daemon to avoid deadlocks
umount_nfs $N0