]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
librbd: filter expected error codes from is_exclusive_lock_owner 15483/head
authorJason Dillaman <dillaman@redhat.com>
Mon, 5 Jun 2017 12:17:05 +0000 (08:17 -0400)
committerJason Dillaman <dillaman@redhat.com>
Mon, 5 Jun 2017 12:17:05 +0000 (08:17 -0400)
Fixes: http://tracker.ceph.com/issues/20182
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
src/librbd/internal.cc

index 40931127bd1ac3785bc08b78d51f7da1c393dec6..c803ed5421510db1f30d08a719a6e12d8aa97f3a 100644 (file)
@@ -1132,7 +1132,9 @@ int validate_pool(IoCtx &io_ctx, CephContext *cct) {
     // might have been blacklisted by peer -- ensure we still own
     // the lock by pinging the OSD
     int r = ictx->exclusive_lock->assert_header_locked();
-    if (r < 0) {
+    if (r == -EBUSY || r == -ENOENT) {
+      return 0;
+    } else if (r < 0) {
       return r;
     }