From: Samuel Just <sam.just@inktank.com>
Date: Mon, 30 Jun 2014 20:40:07 +0000 (-0700)
Subject: PGLog: fix clear() to avoid the IndexLog::zero() asserts
X-Git-Tag: v0.80.6~73
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2427ea8f153caf55b3bce77cd2fc88935563c7b3;p=ceph.git

PGLog: fix clear() to avoid the IndexLog::zero() asserts

Introduced in:
  c5b8d8105d965da852c79add607b69d5ae79a4d4
  ac11ca40b4f4525cbe9b1778b1c5d9472ecb9efa
Signed-off-by: Samuel Just <sam.just@inktank.com>

(cherry picked from commit 959f2b25910360b930183fbf469ce984a48542dd)
---

diff --git a/src/osd/PGLog.cc b/src/osd/PGLog.cc
index 36b26e73adf5..9523b12bf928 100644
--- a/src/osd/PGLog.cc
+++ b/src/osd/PGLog.cc
@@ -136,7 +136,7 @@ void PGLog::reset_backfill()
 void PGLog::clear() {
   divergent_priors.clear();
   missing.clear();
-  log.zero();
+  log.clear();
   log_keys_debug.clear();
   undirty();
 }
diff --git a/src/osd/PGLog.h b/src/osd/PGLog.h
index ca4763068a07..20021896f385 100644
--- a/src/osd/PGLog.h
+++ b/src/osd/PGLog.h
@@ -109,6 +109,11 @@ struct PGLog {
       rollback_info_trimmed_to_riter = log.rbegin();
       reset_recovery_pointers();
     }
+    void clear() {
+      rollback_info_trimmed_to = head;
+      rollback_info_trimmed_to_riter = log.rbegin();
+      zero();
+    }
     void reset_recovery_pointers() {
       complete_to = log.end();
       last_requested = 0;