]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osdc: op left in check_lastest_map_ops
authorDavid Zafman <david.zafman@inktank.com>
Wed, 31 Jul 2013 18:08:34 +0000 (11:08 -0700)
committerDavid Zafman <david.zafman@inktank.com>
Wed, 31 Jul 2013 22:51:13 +0000 (15:51 -0700)
Call op_cancel_map_check before cancel_op() in send_linger()

Fixes: #5784
Signed-off-by: David Zafman <david.zafman@inktank.com>
src/osdc/Objecter.cc

index 3632ae1c24c3487ca6e4133052f410611c06e88e..ab4954ee216b2c283e83dcd9f7cec96d1606e247 100644 (file)
@@ -295,6 +295,7 @@ void Objecter::send_linger(LingerOp *info)
     // repeat send.  cancel old registeration op, if any.
     if (ops.count(info->register_tid)) {
       Op *o = ops[info->register_tid];
+      op_cancel_map_check(o);
       cancel_op(o);
     }
     info->register_tid = _op_submit(o);