From 02557f8bc05ff28013e241611cb046b28f97b4c6 Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Tue, 15 Apr 2014 12:55:47 -0700 Subject: [PATCH] Objecter::_op_submit: only replace the tid if it's 0 Otherwise, redirected ops will suddenly have a different tid and will become uncancelable. Fixes: #7588 Signed-off-by: Samuel Just (cherry picked from commit 76568aa0db4e16ac1af8fe6405edade1e61cbc81) --- src/osdc/Objecter.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc index 9af742ef91b4e..e165266101158 100644 --- a/src/osdc/Objecter.cc +++ b/src/osdc/Objecter.cc @@ -1243,9 +1243,11 @@ ceph_tid_t Objecter::op_submit(Op *op) ceph_tid_t Objecter::_op_submit(Op *op) { - // pick tid - ceph_tid_t mytid = ++last_tid; - op->tid = mytid; + // pick tid if we haven't got one yet + if (op->tid == ceph_tid_t(0)) { + ceph_tid_t mytid = ++last_tid; + op->tid = mytid; + } assert(client_inc >= 0); // pick target -- 2.39.5