From 061e7619aacf60a828e0ce84a108d5a0bea247c6 Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Fri, 16 Dec 2011 11:30:46 -0800 Subject: [PATCH] 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 --- src/osd/ReplicatedPG.cc | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index 2798bc3a4e687..5f4d49b4984e3 100644 --- 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! -- 2.39.5