MOSDOpReply: rename *_version() -> *_replay_version()

We have been returning the object's "user version" and using that
for replay, but that is in fact incorrect. In preparation for fixing
up the user version semantics, rename get_version to get_replay_version
and set_version to set_replay_version.

Signed-off-by: Greg Farnum <greg@inktank.com>

diff --git a/src/messages/MOSDOpReply.h b/src/messages/MOSDOpReply.h
index 7bbe6e24091ff3edc3456f46808966eece585103..3891a2409e381124df740bf9d875ca027a174999 100644 (file)
--- a/src/messages/MOSDOpReply.h
+++ b/src/messages/MOSDOpReply.h
@@ -52,10 +52,10 @@ public:
   bool     is_onnvram() const { return get_flags() & CEPH_OSD_FLAG_ONNVRAM; }
   
   int get_result() const { return result; }
-  eversion_t get_version() { return replay_version; }
+  eversion_t get_replay_version() { return replay_version; }
   
   void set_result(int r) { result = r; }
-  void set_version(eversion_t v) { replay_version = v; }
+  void set_replay_version(eversion_t v) { replay_version = v; }
 
   void add_flags(int f) { flags |= f; }
 

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 55f11707189b13ff286dad09d077c447db59711f..d020f900918901e4b8a5356866326b226d368245 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -6810,7 +6810,7 @@ void OSDService::reply_op_error(OpRequestRef op, int err, eversion_t v)
 
   MOSDOpReply *reply = new MOSDOpReply(m, err, osdmap->get_epoch(), flags);
   Messenger *msgr = client_messenger;
-  reply->set_version(v);
+  reply->set_replay_version(v);
   if (m->get_source().is_osd())
     msgr = cluster_messenger;
   msgr->send_message(reply, m->get_connection());

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 6c7ec56af88989b4ba5ad5f589e33563cc2ee95d..77774ea01ffd7c6b8a76a0914d2520cf1ced5811 100644 (file)
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -1028,9 +1028,9 @@ void ReplicatedPG::do_op(OpRequestRef op)
   ctx->reply->set_result(result);
 
   if (result >= 0)
-    ctx->reply->set_version(ctx->reply_version);
+    ctx->reply->set_replay_version(ctx->reply_version);
   else if (result == -ENOENT)
-    ctx->reply->set_version(info.last_update);
+    ctx->reply->set_replay_version(info.last_update);
 
   // read or error?
   if (ctx->op_t.empty() || result < 0) {

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index eb490cef33089d9d2c0ba45b72f10f98063141b3..59803e0559d1340ed82f4c9add569169ddad88f1 100644 (file)
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -1515,7 +1515,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_version() << " in " << m->get_pg()
+               << " v " << m->get_replay_version() << " in " << m->get_pg()
                << " attempt " << m->get_retry_attempt()
                << dendl;
   Op *op = ops[tid];
@@ -1552,7 +1552,7 @@ void Objecter::handle_osd_op_reply(MOSDOpReply *m)
   }
 
   if (op->objver)
-    *op->objver = m->get_version();
+    *op->objver = m->get_replay_version();
   if (op->reply_epoch)
     *op->reply_epoch = m->get_map_epoch();
 
@@ -1592,7 +1592,7 @@ void Objecter::handle_osd_op_reply(MOSDOpReply *m)
   // ack|commit -> ack
   if (op->onack) {
     ldout(cct, 15) << "handle_osd_op_reply ack" << dendl;
-    op->version = m->get_version();
+    op->version = m->get_replay_version();
     onack = op->onack;
     op->onack = 0;  // only do callback once
     num_unacked--;