]> git-server-git.apps.pok.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)
committerJianpeng Ma <jianpeng.ma@intel.com>
Tue, 1 Sep 2015 07:39:29 +0000 (15:39 +0800)
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
src/osdc/Objecter.cc

index ebcade71ba459788be2e6d770ea36f593ca8e2eb..4852550a207e25e3f4f8bff1a62b637c87c463cc 100644 (file)
@@ -1155,6 +1155,7 @@ void Objecter::handle_osd_map(MOSDMap *m)
        _send_op(op);
       }
     } else {
+      _op_cancel_map_check(op);
       _cancel_linger_op(op);
     }
     s->lock.unlock();
@@ -1809,6 +1810,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);
     }
   }