Merge PR #33662 into master

* refs/pull/33662/head:
	mds: handle ceph_assert on blacklisting

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
This commit is contained in:
Patrick Donnelly 2020-03-04 20:01:39 -08:00
commit 16f2495471
No known key found for this signature in database
GPG Key ID: 3A2A7E25BEA8AADB

View 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);
}