RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-21 01:47:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4170 from ceph/hammer-11205

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

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
This commit is contained in:
Gregory Farnum 2015-03-24 21:35:29 -07:00
commit e7e0ea626e
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
qa/workunits/fs/misc/filelock_interrupt.py
View File

@ -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")