X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fflocks_test.c;h=be5e38f1da3cedbb75256fdf25588f7bcd961b71;hb=551dc77e6ecd590d35fe7759124b98961642e831;hp=ab38fa0c46d31bd10863a37f1419bc4c685b74ed;hpb=6a073773939cd515055dfb85e522001121261feb;p=fs%2Flustre-release.git

diff --git a/lustre/tests/flocks_test.c b/lustre/tests/flocks_test.c
index ab38fa0..be5e38f 100644
--- a/lustre/tests/flocks_test.c
+++ b/lustre/tests/flocks_test.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, Intel Corporation.
+ * Copyright (c) 2011, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -62,9 +62,10 @@ int t_fcntl(int fd, int cmd, ...)
                 va_end(ap);
                 rc = fcntl(fd, cmd);
                 if (rc == -1) {
+			rc = -errno;
                         fprintf(stderr, "fcntl GETFL failed: %s\n",
                                 strerror(errno));
-                        return(1);
+			return rc;
                 }
                 break;
         case F_SETFL:
@@ -72,9 +73,10 @@ int t_fcntl(int fd, int cmd, ...)
                 va_end(ap);
                 rc = fcntl(fd, cmd, arg);
                 if (rc == -1) {
+			rc = -errno;
                         fprintf(stderr, "fcntl SETFL %ld failed: %s\n",
                                 arg, strerror(errno));
-                        return(1);
+			return rc ;
                 }
                 break;
         case F_GETLK:
@@ -84,9 +86,10 @@ int t_fcntl(int fd, int cmd, ...)
                 va_end(ap);
                 rc = fcntl(fd, cmd, lock);
                 if (rc == -1) {
+			rc = -errno;
                         fprintf(stderr, "fcntl cmd %d failed: %s\n",
                                 cmd, strerror(errno));
-                        return(1);
+			return rc ;
                 }
                 break;
         case F_DUPFD:
@@ -94,15 +97,16 @@ int t_fcntl(int fd, int cmd, ...)
                 va_end(ap);
                 rc = fcntl(fd, cmd, arg);
                 if (rc == -1) {
+			rc = -errno;
                         fprintf(stderr, "fcntl F_DUPFD %d failed: %s\n",
                                 (int)arg, strerror(errno));
-                        return(1);
+			return rc;
                 }
                 break;
         default:
                 va_end(ap);
                 fprintf(stderr, "fcntl cmd %d not supported\n", cmd);
-                return(1);
+		return rc;
         }
         return rc;
 }
@@ -149,7 +153,7 @@ int t1(int argc, char *argv[])
         }
 
         if ((fd = open(argv[4], O_RDWR)) < 0) {
-                fprintf(stderr, "Couldn't open file: %s\n", argv[3]);
+		fprintf(stderr, "Couldn't open file: %s\n", argv[4]);
                 return EXIT_FAILURE;
         }
 
@@ -249,7 +253,7 @@ int t2(int argc, char* argv[])
 
         t_fcntl(fd, F_SETFL, O_APPEND);
         rc = t_fcntl(fd, F_GETFL);
-        if ((rc & O_APPEND) == 0) {
+	if ((rc < 0) || (rc & O_APPEND) == 0) {
                 fprintf(stderr, "error get flag: ret %x\n", rc);
 		rc = EXIT_FAILURE;
 		goto out;
@@ -296,7 +300,7 @@ int t3(int argc, char *argv[])
         }
 
         if ((fd = open(argv[2], O_RDWR)) < 0) {
-                fprintf(stderr, "Couldn't open file: %s\n", argv[1]);
+		fprintf(stderr, "Couldn't open file: %s\n", argv[2]);
                 return EXIT_FAILURE;
         }
         if (flock(fd, LOCK_EX | LOCK_NB) < 0) {
@@ -305,7 +309,7 @@ int t3(int argc, char *argv[])
                 goto out;
         }
         if ((fd2 = open(argv[2], O_RDWR)) < 0) {
-                fprintf(stderr, "Couldn't open file: %s\n", argv[1]);
+		fprintf(stderr, "Couldn't open file: %s\n", argv[2]);
                 rc = EXIT_FAILURE;
                 goto out;
         }
@@ -367,7 +371,8 @@ int t4(int argc, char *argv[])
 	};
 
 	int fd, fd2;
-	int pid;
+	pid_t child_pid;
+	int child_status;
 	int rc = EXIT_SUCCESS;
 
 	if (argc != 4) {
@@ -385,18 +390,19 @@ int t4(int argc, char *argv[])
 		goto out;
 	}
 
-	pid = fork();
-	if (pid == -1) {
+	child_pid = fork();
+	if (child_pid < 0) {
 		perror("fork");
 		rc = EXIT_FAILURE;
 		goto out;
 	}
 
-	if (pid == 0) {
+	if (child_pid == 0) {
 		printf("%d: get lock1\n", getpid());
 		fflush(stdout);
 		if (t_fcntl(fd, F_SETLKW, &lock) < 0) {
-			perror("first flock failed");
+			fprintf(stderr, "%d: cannot get lock1: %s\n",
+				getpid(), strerror(errno));
 			rc = EXIT_FAILURE;
 			goto out_child;
 		}
@@ -405,8 +411,14 @@ int t4(int argc, char *argv[])
 		printf("%d: get lock2\n", getpid());
 		fflush(stdout);
 		if (t_fcntl(fd2, F_SETLKW, &lock) < 0) {
-			perror("first flock failed");
-			rc = EXIT_FAILURE;
+			fprintf(stderr, "%d: cannot get lock2: %s\n",
+				getpid(), strerror(errno));
+
+			if (errno == EDEADLK)
+				rc = EXIT_SUCCESS;
+			else
+				rc = EXIT_FAILURE;
+
 			goto out_child;
 		}
 		printf("%d: done\n", getpid());
@@ -417,7 +429,8 @@ out_child:
 		printf("%d: get lock2\n", getpid());
 		fflush(stdout);
 		if (t_fcntl(fd2, F_SETLKW, &lock) < 0) {
-			perror("first flock failed");
+			fprintf(stderr, "%d: cannot get lock2: %s\n",
+				getpid(), strerror(errno));
 			rc = EXIT_FAILURE;
 			goto out;
 		}
@@ -426,18 +439,132 @@ out_child:
 		printf("%d: get lock1\n", getpid());
 		fflush(stdout);
 		if (t_fcntl(fd, F_SETLKW, &lock) < 0) {
-			perror("first flock failed");
-			rc = EXIT_FAILURE;
-			goto out;
+			fprintf(stderr, "%d: cannot get lock1: %s\n",
+				getpid(), strerror(errno));
+
+			if (errno != EDEADLK) {
+				rc = EXIT_FAILURE;
+				goto out;
+			}
 		}
 		printf("%d: done\n", getpid());
 	}
 
+	sleep(1);
+
+	if (close(fd) < 0) {
+		fprintf(stderr, "%d: error closing file1: %s\n",
+			getpid(), strerror(errno));
+		rc = EXIT_FAILURE;
+	}
+
+	if (close(fd2) < 0) {
+		fprintf(stderr, "%d: error closing file2: %s\n",
+			getpid(), strerror(errno));
+		rc = EXIT_FAILURE;
+	}
+
+	if (waitpid(child_pid, &child_status, 0) < 0) {
+		fprintf(stderr, "%d: cannot get termination status of %d: %s\n",
+			getpid(), child_pid, strerror(errno));
+		rc = EXIT_FAILURE;
+	} else if (!WIFEXITED(child_status)) {
+		fprintf(stderr, "%d: child %d terminated with status %d\n",
+			getpid(), child_pid, child_status);
+		rc = EXIT_FAILURE;
+	} else {
+		rc = WEXITSTATUS(child_status);
+	}
+
 out:
 	printf("%d: exit rc=%d\n", getpid(), rc);
 	return rc;
 }
 
+#define T5_USAGE							      \
+	"Usage: ./flocks_test 5 set|get|unlock [read|write] [sleep N] file1\n"\
+"       set: F_SETLKW F_WRLCK\n"				              \
+"       get: F_GETLK F_WRLCK  (conflict)\n"			              \
+"       unlock: F_SETLKW F_UNLCK\n"				              \
+"       read|write: lock mode, write by default\n"		              \
+"       sleep N: sleep for N secs after fcntl\n"		              \
+"       file1: fcntl is called for this file\n"
+
+int t5(int argc, char *argv[])
+{
+	struct flock lock = {
+		.l_type = F_WRLCK,
+		.l_whence = SEEK_SET,
+	};
+
+	int setlk = 0, getlk = 0, unlk = 0, secs = 0;
+	int pos;
+	int fd;
+	int rc = 0;
+
+	if (argc < 4 || argc > 7) {
+		fprintf(stderr, T5_USAGE);
+		return EXIT_FAILURE;
+	}
+
+	if (!strncmp(argv[2], "set", 4))
+		setlk = 1;
+	else if (!strncmp(argv[2], "get", 4))
+		getlk = 1;
+	else if (!strncmp(argv[2], "unlock", 7))
+		unlk = 1;
+	else {
+		fprintf(stderr, "Wrong 2nd argument: %s\n", argv[2]);
+		return EXIT_FAILURE;
+	}
+
+	pos = 3;
+
+	if (!strncmp(argv[pos], "read", 5)) {
+		lock.l_type = F_RDLCK;
+		pos++;
+	} else if (!strncmp(argv[pos], "write", 6)) {
+		lock.l_type = F_WRLCK;
+		pos++;
+	}
+
+	if (!strncmp(argv[pos], "sleep", 6)) {
+		secs = atoi(argv[pos + 1]);
+		if (secs < 0 || secs > 10) {
+			fprintf(stderr, "Sleep argument is wrong: %s\n",
+				argv[pos + 1]);
+			return EXIT_FAILURE;
+		}
+		pos += 2;
+	}
+
+	fd = open(argv[pos], O_RDWR);
+	if (fd < 0) {
+		fprintf(stderr, "Couldn't open file: %s\n", argv[pos]);
+		return EXIT_FAILURE;
+	}
+
+	fprintf(stderr, "\nFLOCKS_TEST 5: %s %s flock\n",
+		setlk ? "SET" : getlk ? "GET" : "UNLOCK",
+		lock.l_type == F_WRLCK ? "write" : "read");
+
+	if (setlk) {
+		rc = t_fcntl(fd, F_SETLKW, &lock);
+	} else if (getlk) {
+		rc = t_fcntl(fd, F_GETLK, &lock);
+	} else if (unlk) {
+		lock.l_type = F_UNLCK;
+		rc = t_fcntl(fd, F_SETLKW, &lock);
+	}
+
+	if (secs)
+		sleep(secs);
+
+	close(fd);
+	return rc < 0 ? -rc : 0;
+
+}
+
 /** ==============================================================
  * program entry
  */
@@ -470,7 +597,10 @@ int main(int argc, char* argv[])
 	case 4:
 		rc = t4(argc, argv);
 		break;
-        default:
+	case 5:
+		rc = t5(argc, argv);
+		break;
+	default:
                 fprintf(stderr, "unknow test number %s\n", argv[1]);
                 break;
         }