From: Yan, Zheng <zyan@redhat.com>
Date: Thu, 19 Mar 2015 09:58:28 +0000 (+0800)
Subject: test/libcephfs/flock.cc: don't release lock before EWOULDBLOCK check
X-Git-Tag: v9.0.0~119^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F4117%2Fhead;p=ceph.git

test/libcephfs/flock.cc: don't release lock before EWOULDBLOCK check

make sure the main thread/process not release the file lock before
workers execute the operation that supposes to return EWOULDBLOCK.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
---

diff --git a/src/test/libcephfs/flock.cc b/src/test/libcephfs/flock.cc
index d92a8429dd2e..2bea91fa2703 100644
--- a/src/test/libcephfs/flock.cc
+++ b/src/test/libcephfs/flock.cc
@@ -171,10 +171,10 @@ static void thread_ConcurrentLocking(str_ConcurrentLocking& s) {
 
   const int fd = ceph_open(cmount, s.file, O_RDWR | O_CREAT, fileMode);
   ASSERT_GE(fd, 0); 
-  PING_MAIN(1); // (1)
 
   ASSERT_EQ(-EWOULDBLOCK,
 	    ceph_flock(cmount, fd, LOCK_EX | LOCK_NB, pthread_self()));
+  PING_MAIN(1); // (1)
   ASSERT_EQ(0, ceph_flock(cmount, fd, LOCK_EX, pthread_self()));
   PING_MAIN(2); // (2)
 
@@ -386,8 +386,6 @@ static void process_ConcurrentLocking(str_ConcurrentLocking& s) {
   const pid_t mypid = getpid();
   PROCESS_SLOW_MS();
 
-  PING_MAIN(1); // (1)
-
   struct ceph_mount_info *cmount = NULL;
   struct timespec ts;
 
@@ -400,6 +398,7 @@ static void process_ConcurrentLocking(str_ConcurrentLocking& s) {
 
   ASSERT_EQ(-EWOULDBLOCK,
 	    ceph_flock(cmount, fd, LOCK_EX | LOCK_NB, mypid));
+  PING_MAIN(1); // (1)
   ASSERT_EQ(0, ceph_flock(cmount, fd, LOCK_EX, mypid));
   PING_MAIN(2); // (2)
 
@@ -462,8 +461,8 @@ TEST(LibCephFS, InterProcessLocking) {
   ASSERT_EQ(0, ceph_flock(cmount, fd, LOCK_EX, mypid));
 
   // Synchronization point with process (failure: process is dead)
-  WAIT_WORKER(1); // (1)
   PING_WORKER(1); // (R1)
+  WAIT_WORKER(1); // (1)
 
   // Shall not have lock immediately
   NOT_WAIT_WORKER(2); // (2)
@@ -568,8 +567,8 @@ TEST(LibCephFS, ThreesomeInterProcessLocking) {
   ASSERT_EQ(0, ceph_flock(cmount, fd, LOCK_EX, mypid));
 
   // Synchronization point with process (failure: process is dead)
-  TWICE(WAIT_WORKER(1)); // (1)
   TWICE(PING_WORKER(1)); // (R1)
+  TWICE(WAIT_WORKER(1)); // (1)
 
   // Shall not have lock immediately
   NOT_WAIT_WORKER(2); // (2)