diff options
| author | David Zafman <david.zafman@inktank.com> | 2013-07-31 11:08:34 -0700 |
|---|---|---|
| committer | David Zafman <david.zafman@inktank.com> | 2013-07-31 15:51:13 -0700 |
| commit | 600e6aca2c08a1b7b60dbdb9595a28fdfbf8ecb6 (patch) | |
| tree | 3f1b4d641a8d42a3834aee3f227e3d4b72ae22ab | |
| parent | d651658d17582b601120aee246e7528e2fdb7beb (diff) | |
| download | ceph-600e6aca2c08a1b7b60dbdb9595a28fdfbf8ecb6.tar.gz | |
osdc: op left in check_lastest_map_ops
Call op_cancel_map_check before cancel_op() in send_linger()
Fixes: #5784
Signed-off-by: David Zafman <david.zafman@inktank.com>
| -rw-r--r-- | src/osdc/Objecter.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc index 3632ae1c24c..ab4954ee216 100644 --- a/src/osdc/Objecter.cc +++ b/src/osdc/Objecter.cc @@ -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); |