From a551a23d36e3f30ff5b0679a98ee760166ae47ae Mon Sep 17 00:00:00 2001 From: "Yan, Zheng" Date: Mon, 2 Mar 2015 21:04:25 +0800 Subject: [PATCH] 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 (cherry picked from commit 4ececa3dc4a21b98f61a592da9e2be60a0d71625) Reviewed-by: Greg Farnum --- qa/workunits/fs/misc/filelock_interrupt.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/qa/workunits/fs/misc/filelock_interrupt.py b/qa/workunits/fs/misc/filelock_interrupt.py index 386fbd7163541..a17fa39e9dc62 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") -- 2.39.5