ReplicatedPG: fix handle_watch_timeout ctx->at_version

ctx->at_version should match the head of the new log entries
during issue_repop.  This could cause the scrub hang bug as
last_update would be less than last_update_applied.

Signed-off-by: Samuel Just <samuel.just@dreamhost.com>

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 2798bc3a4e687cfecdac697c073ff39897b7be82..5f4d49b4984e3c89dfdaf1fc87c50d77dc20f62d 100644 (file)
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -3077,8 +3077,6 @@ void ReplicatedPG::handle_watch_timeout(void *_obc,
   ::encode(obc->obs.oi, bl);
   t->setattr(coll, obc->obs.oi.soid, OI_ATTR, bl);
 
-  ctx->at_version.version++;
-
   append_log(repop->ctx->log, eversion_t(), repop->ctx->local_t);
 
   // obc ref swallowed by repop!