From: Pan Liu <liupan1111@gmail.com>
Date: Tue, 28 Mar 2017 14:16:15 +0000 (+0800)
Subject: librados: set the flag CEPH_OSD_FLAG_FULL_TRY of Op in the right place.
X-Git-Tag: v12.0.2~236^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7011c88e45ebf4d3e47de31f283d904088e2632b;p=ceph.git

librados: set the flag CEPH_OSD_FLAG_FULL_TRY of Op in the right place.

Signed-off-by: Pan Liu <liupan1111@gmail.com>
---

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index d45e4c45fb0..15968dd19b8 100644
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -2352,6 +2352,10 @@ void Objecter::_op_submit(Op *op, shunique_lock& sul, ceph_tid_t *ptid)
 
   assert(op->target.flags & (CEPH_OSD_FLAG_READ|CEPH_OSD_FLAG_WRITE));
 
+  if (osdmap_full_try) {
+    op->target.flags |= CEPH_OSD_FLAG_FULL_TRY;
+  }
+
   bool need_send = false;
 
   if ((op->target.flags & CEPH_OSD_FLAG_WRITE) &&
@@ -3063,9 +3067,6 @@ MOSDOp *Objecter::_prepare_osd_op(Op *op)
   if (!honor_osdmap_full)
     flags |= CEPH_OSD_FLAG_FULL_FORCE;
 
-  if (osdmap_full_try)
-    flags |= CEPH_OSD_FLAG_FULL_TRY;
-
   op->target.paused = false;
   op->stamp = ceph::mono_clock::now();