osd: one more flush before collection_list

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 1090df34851b1ea18ac092d6bd968767f5a45d03..b9a50f959363431a77533ea5c288ca0d09025873 100644 (file)
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -802,6 +802,9 @@ bool ReplicatedPG::get_obs_to_trim(snapid_t &snap_to_trim,
     return true;
   }
 
+  // flush pg ops to fs so we can rely on collection_list()
+  osr.flush();
+
   osd->store->collection_list(col_to_trim, obs_to_trim);
 
   return true;
@@ -4739,8 +4742,6 @@ void ReplicatedPG::clean_up_local(ObjectStore::Transaction& t)
 
   if (log.backlog) {
 
-    // FIXME: sloppy pobject vs object conversions abound!  ***
-    
     // be thorough.
     vector<hobject_t> ls;
     osd->store->collection_list(coll, ls);