From 33c9907662ad5b504581b373c4f4e3b4b5a1cc63 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 3 Nov 2017 14:52:33 -0500 Subject: [PATCH] osd/PG: some whitespace Signed-off-by: Sage Weil --- src/osd/PG.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/osd/PG.cc b/src/osd/PG.cc index 38f9a3c612fc1..d3e6a215755c8 100644 --- a/src/osd/PG.cc +++ b/src/osd/PG.cc @@ -1624,10 +1624,10 @@ void PG::activate(ObjectStore::Transaction& t, if (intersection == info.purged_snaps) { snap_trimq.subtract(info.purged_snaps); } else { - dout(0) << "warning: info.purged_snaps (" << info.purged_snaps - << ") is not a subset of pool.cached_removed_snaps (" - << pool.cached_removed_snaps << ")" << dendl; - snap_trimq.subtract(intersection); + dout(0) << "warning: info.purged_snaps (" << info.purged_snaps + << ") is not a subset of removed_snaps" << dendl; + snap_trimq.subtract(intersection); + assert(!cct->_conf->osd_debug_verify_cached_snaps); } } @@ -3523,8 +3523,8 @@ void PG::update_snap_map( */ void PG::filter_snapc(vector &snaps) { - //nothing needs to trim, we can return immediately - if(snap_trimq.empty() && info.purged_snaps.empty()) + // nothing needs to trim, we can return immediately + if (snap_trimq.empty() && info.purged_snaps.empty()) return; bool filtering = false; -- 2.39.5