]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osdc/Objecter: Don't forget call _op_cancel_map_check when cancel linger op.
authorJianpeng Ma <jianpeng.ma@intel.com>
Tue, 1 Sep 2015 07:39:29 +0000 (15:39 +0800)
committerLoic Dachary <ldachary@redhat.com>
Fri, 2 Oct 2015 13:38:42 +0000 (15:38 +0200)
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
(cherry picked from commit 7cc963b1c6ab37bf33638dc6eca7848d93f7908f)

src/osdc/Objecter.cc

index d318d18e7958d533cbc22f324c0e3bb52f01db54..351a50a176370ac09ab432942992c14d1b4d9ceb 100644 (file)
@@ -1126,6 +1126,7 @@ void Objecter::handle_osd_map(MOSDMap *m)
        _send_op(op);
       }
     } else {
+      _op_cancel_map_check(op);
       _cancel_linger_op(op);
     }
     s->lock.unlock();
@@ -1780,6 +1781,7 @@ void Objecter::_kick_requests(OSDSession *session, map<uint64_t, LingerOp *>& lr
       if (!op->target.paused)
        resend[op->tid] = op;
     } else {
+      _op_cancel_map_check(op);
       _cancel_linger_op(op);
     }
   }