From: Pan Liu <wanjun.lp@alibaba-inc.com>
Date: Wed, 23 Aug 2017 04:00:53 +0000 (+0800)
Subject: osd: allow FULL_TRY after failsafe
X-Git-Tag: v13.0.1~1128^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F17177%2Fhead;p=ceph.git

osd: allow FULL_TRY after failsafe

Signed-off-by: Pan Liu <wanjun.lp@alibaba-inc.com>
---

diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
index ac3db593e672..fb18fd5c4d65 100644
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@ -1978,7 +1978,7 @@ void PrimaryLogPG::do_op(OpRequestRef& op)
   // We can't allow OSD to become non-startable even if mds
   // could be writing as part of file removals.
   ostringstream ss;
-  if (write_ordered && osd->check_failsafe_full(ss)) {
+  if (write_ordered && osd->check_failsafe_full(ss) && !m->has_flag(CEPH_OSD_FLAG_FULL_TRY)) {
     dout(10) << __func__ << " fail-safe full check failed, dropping request"
              << ss.str()
 	     << dendl;