osd: PG::trim: add assert

Assert that we're not trimming the PG log past last_complete.

Signed-off-by: Colin McCabe <colinm@hq.newdream.net>

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 96374807aa20da78ab24448f6e0da8fcb43d248d..351a6193399363905a49a940c370d5c9a1b1eea6 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -2137,6 +2137,9 @@ void PG::trim(ObjectStore::Transaction& t, eversion_t trim_to)
 {
   // trim?
   if (trim_to > log.tail) {
+    // We shouldn't be trimming the log past last_complete
+    assert(trim_to >= info.last_complete);
+
     dout(10) << "trim " << log << " to " << trim_to << dendl;
     log.trim(t, trim_to);
     info.log_tail = log.tail;

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index bf013c0ed29ffa1a7787dc41b883387a5047288a..368801e8837549a59d01c36c6200d469824a53f7 100644 (file)
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -226,8 +226,10 @@ void ReplicatedPG::calc_trim_to()
       pg_trim_to = min_last_complete_ondisk;
       assert(pg_trim_to <= log.head);
     }
-  } else
+  } else {
+    // don't trim
     pg_trim_to = eversion_t();
+  }
 }
 
 /** do_op - do an op