RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-29 06:52:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #34134 from zhangdaolong/fix_incorrect_log_info

Browse Source 
pybind/rbd: fix no lockers are obtained, ImageNotFound exception will be output
This commit is contained in:
Mykola Golub 2020-04-01 21:01:23 +03:00 committed by GitHub
commit 3cd90d751b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/pybind/rbd/rbd.pyx
View File

@ -5493,6 +5493,9 @@ cdef class LockOwnerIterator(object):
&self.num_lock_owners)
if ret >= 0:
break
elif ret == -errno.ENOENT:
self.num_lock_owners = 0
break
elif ret != -errno.ERANGE:
raise make_ex(ret, 'error listing lock owners for image %s' % image.name)

5
src/test/pybind/test_rbd.py
View File

@ -1859,10 +1859,13 @@ class TestExclusiveLock(object):
rados2.conf_set('rbd_blacklist_on_break_lock', 'true')
with Image(ioctx2, image_name) as image, \
Image(blacklist_ioctx, image_name) as blacklist_image:
lock_owners = list(image.lock_get_owners())
eq(0, len(lock_owners))
blacklist_image.lock_acquire(RBD_LOCK_MODE_EXCLUSIVE)
assert_raises(ReadOnlyImage, image.lock_acquire,
RBD_LOCK_MODE_EXCLUSIVE)
lock_owners = list(image.lock_get_owners())
eq(1, len(lock_owners))
eq(RBD_LOCK_MODE_EXCLUSIVE, lock_owners[0]['mode'])