From: Samuel Just <sam.just@inktank.com>
Date: Tue, 10 Dec 2013 18:50:59 +0000 (-0800)
Subject: PGLog: we cannot rollback past a recovered object entry
X-Git-Tag: v0.78~286^2~24
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=347d968a9d9c181b220e6b9c8c688d1d48cb698b;p=ceph.git

PGLog: we cannot rollback past a recovered object entry

We don't recover the older versions, so we can't do a rollback.
In general, this is ok since we had enough copies to recover it
in the first place.

Signed-off-by: Samuel Just <sam.just@inktank.com>
---

diff --git a/src/osd/PGLog.h b/src/osd/PGLog.h
index 0afd23eb09b5..6c8cc0985168 100644
--- a/src/osd/PGLog.h
+++ b/src/osd/PGLog.h
@@ -359,6 +359,9 @@ public:
 	log.complete_to++;
       }
     }
+
+    if (log.can_rollback_to < v)
+      log.can_rollback_to = v;
   }
 
   void activate_not_complete(pg_info_t &info) {