From: Sage Weil <sage.weil@dreamhost.com>
Date: Thu, 19 Jan 2012 02:01:09 +0000 (-0800)
Subject: osd: do not clobber log on backfill progress update
X-Git-Tag: v0.41~22
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5451d871cf315f611f03de127f379fe92c05f29b;p=ceph.git

osd: do not clobber log on backfill progress update

This is unnecessary and counterproductive, since the log is used to detect
dup ops.  It's an artifact of an earlier backfill iteration that didn't
preserve the log on the backfill target.

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index b81a03848bbe..335779ff1d42 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -984,14 +984,7 @@ void ReplicatedPG::do_backfill(MOSDPGBackfill *m)
       info.last_backfill = m->last_backfill;
       info.stats.stats = m->stats;
 
-      log.clear();
-      log.head = info.last_update;
-      log.tail = info.last_update;
-
-      info.log_tail = log.tail;
-
       ObjectStore::Transaction *t = new ObjectStore::Transaction;
-      write_log(*t);
       write_info(*t);
       int tr = osd->store->queue_transaction(&osr, t);
       assert(tr == 0);