]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: handle ceph_assert on blacklisting 33662/head
authorMilind Changire <mchangir@redhat.com>
Tue, 3 Mar 2020 07:19:56 +0000 (12:49 +0530)
committerMilind Changire <mchangir@redhat.com>
Tue, 3 Mar 2020 07:19:56 +0000 (12:49 +0530)
Add check to journaler to test for EBLACKLISTED error code and return it
back to MDS.

Fixes: https://tracker.ceph.com/issues/44132
Signed-off-by: Milind Changire <mchangir@redhat.com>
src/osdc/Journaler.cc

index 8eac98eebc74c5d4f12360066270552af8cdfd4a..a26d3e96029b5c5e1abbb14247b1cd342fc80648 100644 (file)
@@ -417,6 +417,13 @@ void Journaler::_finish_reread_head_and_probe(int r, C_OnFinisher *onfinish)
     return;
   }
 
+  // Let the caller know that the operation has failed or was intentionally
+  // failed since the caller has been blacklisted.
+  if (r == -EBLACKLISTED) {
+    onfinish->complete(r);
+    return;
+  }
+
   ceph_assert(!r); //if we get an error, we're boned
   _reprobe(onfinish);
 }