]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: cleanup log trim check
authorSage Weil <sage@newdream.net>
Mon, 15 Jun 2009 19:14:45 +0000 (12:14 -0700)
committerSage Weil <sage@newdream.net>
Mon, 15 Jun 2009 19:16:34 +0000 (12:16 -0700)
src/osd/ReplicatedPG.cc

index e071ab6cc3050a10ac1d779f17b6d87d5f75a057..4321b260d451f0d716a82a51b5c6c13e3bd1891a 100644 (file)
@@ -1429,8 +1429,9 @@ void ReplicatedPG::log_op(vector<Log::Entry>& logv, ObjectStore::Transaction& t)
   dout(10) << "log_op " << log << dendl;
 
   // trim log?
-  eversion_t trim_to = is_clean() ? peers_complete_thru : eversion_t();
-  if (log.top.version - log.bottom.version > info.stats.num_objects)
+  eversion_t trim_to;
+  if (is_clean() ||
+      log.top.version - log.bottom.version > info.stats.num_objects)
     trim_to = peers_complete_thru;
 
   bufferlist log_bl;