import ceph pacific 16.2.5

[ceph.git] / ceph / src / mds / MDSContext.cc

diff --git a/ceph/src/mds/MDSContext.cc b/ceph/src/mds/MDSContext.cc
index 8c04586f212e0b62e2e015e7a26c749c03c0efdb..fcf6f764fe4c1cf2538a9f89b547f475eca953d6 100644 (file)
--- a/ceph/src/mds/MDSContext.cc
+++ b/ceph/src/mds/MDSContext.cc
@@ -107,8 +107,11 @@ void MDSIOContextBase::complete(int r) {
     return;
   }
 
-  if (r == -CEPHFS_EBLOCKLISTED) {
-    derr << "MDSIOContextBase: blocklisted!  Restarting..." << dendl;
+  // It's possible that the osd op requests will be stuck and then times out
+  // after "rados_osd_op_timeout", the mds won't know what we should it, just
+  // respawn it.
+  if (r == -CEPHFS_EBLOCKLISTED || r == -CEPHFS_ETIMEDOUT) {
+    derr << "MDSIOContextBase: failed with " << r << ", restarting..." << dendl;
     mds->respawn();
   } else {
     MDSContext::complete(r);