MOSDOpReply: switch to comprehensive instead of individual version setters

There's little point to updating versions individually when we can
do so en masse and avoid mistakes in duplication.

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

diff --git a/src/messages/MOSDOpReply.h b/src/messages/MOSDOpReply.h
index cd5a5113b564faba1add248e86beeeb1a70f062c..7db85678094cb5e4b45749b601482110d3b0a58d 100644 (file)
--- a/src/messages/MOSDOpReply.h
+++ b/src/messages/MOSDOpReply.h
@@ -58,9 +58,34 @@ public:
   version_t get_user_version() { return user_version; }
   
   void set_result(int r) { result = r; }
-  void set_bad_replay_version(eversion_t v) { bad_replay_version = v; }
-  void set_replay_version(eversion_t v) { replay_version = v; }
-  void set_user_version(version_t v) { user_version = v; }
+
+  void set_reply_versions(eversion_t v, version_t uv) {
+    replay_version = v;
+    user_version = uv;
+    /* We go through some shenanigans here for backwards compatibility
+     * with old clients, who do not look at our replay_version and
+     * user_version but instead see what we now call the
+     * bad_replay_version. On pools without caching
+     * the user_version infrastructure is a slightly-laggy copy of
+     * the regular pg version/at_version infrastructure; the difference
+     * being it is not updated on watch ops like that is -- but on updates
+     * it is set equal to at_version. This means that for non-watch write ops
+     * on classic pools, all three of replay_version, user_version, and
+     * bad_replay_version are identical. But for watch ops the replay_version
+     * has been updated, while the user_at_version has not, and the semantics
+     * we promised old clients are that the version they see is not an update.
+     * So set the bad_replay_version to be the same as the user_at_version. */
+    bad_replay_version = v;
+    if (uv) {
+      bad_replay_version.version = uv;
+    }
+  }
+
+  /* Don't fill in replay_version for non-write ops */
+  void set_enoent_reply_versions(eversion_t v, version_t uv) {
+    user_version = uv;
+    bad_replay_version = v;
+  }
 
   void add_flags(int f) { flags |= f; }
 

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index d020f900918901e4b8a5356866326b226d368245..1f514e5964834a82fadb9e404bdc8d277a64686e 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_replay_version(v);
+  reply->set_reply_versions(v, v.version);
   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 71e5a28b4cd4a563e2c8d8360f6753616e7ad869..495e041fd8e62dbd415b8b591cc8f8868d878393 100644 (file)
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -1028,11 +1028,9 @@ void ReplicatedPG::do_op(OpRequestRef op)
   ctx->reply->set_result(result);
 
   if (result >= 0) {
-    ctx->reply->set_replay_version(ctx->at_version);
-    ctx->reply->set_user_version(ctx->new_obs.oi.user_version);
+    ctx->reply->set_reply_versions(ctx->at_version, ctx->at_version.version);
   } else if (result == -ENOENT) {
-    ctx->reply->set_replay_version(info.last_update);
-    ctx->reply->set_user_version(info.last_update.version);
+    ctx->reply->set_enoent_reply_versions(info.last_update, info.last_update.version);
   }
 
   // read or error?