From: jhonxue <jhonxue@tencent.com>
Date: Fri, 5 Mar 2021 15:33:10 +0000 (+0800)
Subject: osd: ignore already dumped osd in dump_item()
X-Git-Tag: v17.1.0~2657^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7813819445e73d1e7f333bd9aaaf42624cd781ec;p=ceph.git

osd: ignore already dumped osd in dump_item()

Fixes: https://tracker.ceph.com/issues/49627

Signed-off-by: Xue Yantao <jhonxue@tencent.com>
---

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index 3dfce67d5cf1..a5af942c6704 100644
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -5227,7 +5227,7 @@ protected:
   }
 
   void dump_item(const CrushTreeDumper::Item &qi, F *f) override {
-    if (!tree && qi.is_bucket())
+    if (!tree && (qi.is_bucket() || dumped_osds.count(qi.id)))
       return;
     if (!should_dump(qi.id))
       return;