]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/PrimaryLogPG: calc clone_overlap size in a more efficient and concise way 17928/head
authorxie xingguo <xie.xingguo@zte.com.cn>
Sat, 23 Sep 2017 02:54:18 +0000 (10:54 +0800)
committerxie xingguo <xie.xingguo@zte.com.cn>
Sat, 23 Sep 2017 02:56:42 +0000 (10:56 +0800)
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
src/osd/PrimaryLogPG.cc

index efdd53e017dbfd05e40631aa23c1f9a2eb40c4a0..cecd6a657865e3a710d22ed79bdea03cb47e2b6b 100644 (file)
@@ -9824,13 +9824,9 @@ void PrimaryLogPG::add_object_context_to_pg_stat(ObjectContextRef obc, pg_stat_t
     assert(obc->ssc);
 
     // subtract off clone overlap
-    if (obc->ssc->snapset.clone_overlap.count(oi.soid.snap)) {
-      interval_set<uint64_t>& o = obc->ssc->snapset.clone_overlap[oi.soid.snap];
-      for (interval_set<uint64_t>::const_iterator r = o.begin();
-          r != o.end();
-          ++r) {
-       stat.num_bytes -= r.get_len();
-      }          
+    auto it = obc->ssc->snapset.clone_overlap.find(oi.soid.snap);
+    if (it != obc->ssc->snapset.clone_overlap.end()) {
+      stat.num_bytes -= it->second.size();
     }
   }