From: Milind Changire <mchangir@redhat.com>
Date: Tue, 3 Mar 2020 07:19:56 +0000 (+0530)
Subject: mds: handle ceph_assert on blacklisting
X-Git-Tag: v15.1.1~113^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=998bb611177da7c70c358335dc5d6609e7c5309d;p=ceph.git

mds: handle ceph_assert on blacklisting

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>
---

diff --git a/src/osdc/Journaler.cc b/src/osdc/Journaler.cc
index 8eac98eebc74..a26d3e96029b 100644
--- a/src/osdc/Journaler.cc
+++ b/src/osdc/Journaler.cc
@@ -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);
 }