From 82776e155af9eb67084e1d8f1d6d0093be51cbd0 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 31 Aug 2011 16:30:25 -0700 Subject: [PATCH] osd: one more flush before collection_list Signed-off-by: Sage Weil --- src/osd/ReplicatedPG.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index 1090df34851b1..b9a50f9593634 100644 --- 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 ls; osd->store->collection_list(coll, ls); -- 2.39.5