From: Yan, Zheng <zyan@redhat.com>
Date: Mon, 2 Mar 2015 13:04:25 +0000 (+0800)
Subject: qa/workunits/fs/misc: fix filelock_interrupt.py
X-Git-Tag: v9.0.0~122^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4ececa3dc4a21b98f61a592da9e2be60a0d71625;p=ceph.git

qa/workunits/fs/misc: fix filelock_interrupt.py

Handle the case that kernel does not support fcntl.F_OFD_SETLK.
Also fix the code that checks if fnctl fails with errno == EINTR.

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

diff --git a/qa/workunits/fs/misc/filelock_interrupt.py b/qa/workunits/fs/misc/filelock_interrupt.py
index 386fbd716354..a17fa39e9dc6 100755
--- a/qa/workunits/fs/misc/filelock_interrupt.py
+++ b/qa/workunits/fs/misc/filelock_interrupt.py
@@ -30,15 +30,22 @@ def main():
     try:
         fcntl.flock(f2, fcntl.LOCK_EX)
     except IOError, e:
-        if e.errno == errno.EINTR:
-            pass
+        if e.errno != errno.EINTR:
+            raise
     else:
         raise RuntimeError("expect flock to block")
 
     fcntl.flock(f1, fcntl.LOCK_UN)
 
     lockdata = struct.pack('hhllhh', fcntl.F_WRLCK, 0, 0, 10, 0, 0)
-    fcntl.fcntl(f1, fcntl.F_OFD_SETLK, lockdata)
+    try:
+        fcntl.fcntl(f1, fcntl.F_OFD_SETLK, lockdata)
+    except IOError, e:
+        if e.errno != errno.EINVAL:
+            raise
+        else:
+            print 'kernel does not support fcntl.F_OFD_SETLK'
+            return
 
     lockdata = struct.pack('hhllhh', fcntl.F_WRLCK, 0, 10, 10, 0, 0)
     fcntl.fcntl(f2, fcntl.F_OFD_SETLK, lockdata)
@@ -52,8 +59,8 @@ def main():
         lockdata = struct.pack('hhllhh', fcntl.F_WRLCK, 0, 0, 0, 0, 0)
         fcntl.fcntl(f2, fcntl.F_OFD_SETLKW, lockdata)
     except IOError, e:
-        if e.errno == errno.EINTR:
-            pass
+        if e.errno != errno.EINTR:
+            raise
     else:
         raise RuntimeError("expect posix lock to block")