From 76cc71b24e16f8c934f4f03aaa9167ff18776fa5 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 20 Feb 2012 09:40:03 -0800 Subject: [PATCH] osd: don't count SNAPDIR as a clone during backfill When we are backfilling, we add in objects as we push them. Do not count the snapdir object as a clone, or else we'll screw up the count. Fixes: #2080 Signed-off-by: Sage Weil --- src/osd/ReplicatedPG.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index 89950d1f8308..80a2da152607 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -3534,12 +3534,12 @@ void ReplicatedPG::add_object_context_to_pg_stat(ObjectContext *obc, pg_stat_t * dout(10) << "add_object_context_to_pg_stat " << oi.soid << dendl; object_stat_sum_t stat; + stat.num_bytes += oi.size; + if (oi.soid.snap != CEPH_SNAPDIR) stat.num_objects++; - stat.num_bytes += oi.size; - - if (oi.soid.snap && oi.soid.snap != CEPH_NOSNAP) { + if (oi.soid.snap && oi.soid.snap != CEPH_NOSNAP && oi.soid.snap != CEPH_SNAPDIR) { stat.num_object_clones++; if (!obc->ssc) -- 2.47.3