From 8f327d11cab449b875ffe9818c9ee7ecfe854204 Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Wed, 12 Jan 2011 12:07:44 -0800 Subject: [PATCH] ReplicatedPG: snap_trimmer work around Currently, an OSD bug is causing snap_trimq to contain some snaps already in purged_snaps. This work around should let kvmtest come back up. A real fix is still needed. Signed-off-by: Samuel Just --- src/osd/ReplicatedPG.cc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index 8c47fe3a80113..9a1dbc26368b6 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -528,6 +528,15 @@ bool ReplicatedPG::snap_trimmer() lock(); dout(10) << "snap_trimmer start, purged_snaps " << info.purged_snaps << dendl; + interval_set s; + s.intersection_of(snap_trimq, info.purged_snaps); + if (!s.empty()) { + dout(0) << "WARNING - snap_trimmer: snap_trimq contained snaps already in " + << "purged_snaps" << dendl; + snap_trimq.subtract(s); + } + + epoch_t current_set_started = info.history.last_epoch_started; while (snap_trimq.size() && -- 2.39.5