From 80af2e4d3204b2bc65a504279708054c443f2e8f Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 3 Feb 2017 15:38:42 -0500 Subject: [PATCH] osdc/Objecter: remove reassert_version We never populate this since we never get an ack. Signed-off-by: Sage Weil --- src/osdc/Objecter.cc | 6 +----- src/osdc/Objecter.h | 1 - 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc index 8d6fe2b05d2cb..400f1c92d1250 100644 --- a/src/osdc/Objecter.cc +++ b/src/osdc/Objecter.cc @@ -3049,9 +3049,6 @@ MOSDOp *Objecter::_prepare_osd_op(Op *op) m->set_mtime(op->mtime); m->set_retry_attempt(op->attempts++); - if (op->replay_version != eversion_t()) - m->set_version(op->replay_version); // we're replaying this op! - if (op->priority) m->set_priority(op->priority); else @@ -3225,8 +3222,7 @@ void Objecter::handle_osd_op_reply(MOSDOpReply *m) ldout(cct, 7) << "handle_osd_op_reply " << tid << (m->is_ondisk() ? " ondisk" : (m->is_onnvram() ? " onnvram" : " ack")) - << " v " << m->get_replay_version() << " uv " - << m->get_user_version() + << " uv " << m->get_user_version() << " in " << m->get_pg() << " attempt " << m->get_retry_attempt() << dendl; diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h index aab5fb336eca0..7946f94991508 100644 --- a/src/osdc/Objecter.h +++ b/src/osdc/Objecter.h @@ -1268,7 +1268,6 @@ public: uint64_t ontimeout; ceph_tid_t tid; - eversion_t replay_version; // for op replay int attempts; version_t *objver; -- 2.39.5