From 7011c88e45ebf4d3e47de31f283d904088e2632b Mon Sep 17 00:00:00 2001 From: Pan Liu Date: Tue, 28 Mar 2017 22:16:15 +0800 Subject: [PATCH] librados: set the flag CEPH_OSD_FLAG_FULL_TRY of Op in the right place. Signed-off-by: Pan Liu --- src/osdc/Objecter.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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(); -- 2.47.3