]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: ignore already dumped osd in dump_item() 40747/head
authorjhonxue <jhonxue@tencent.com>
Fri, 5 Mar 2021 15:33:10 +0000 (23:33 +0800)
committerNathan Cutler <ncutler@suse.com>
Sat, 10 Apr 2021 13:09:07 +0000 (15:09 +0200)
Fixes: https://tracker.ceph.com/issues/49627
Signed-off-by: Xue Yantao <jhonxue@tencent.com>
(cherry picked from commit 7813819445e73d1e7f333bd9aaaf42624cd781ec)

src/osd/OSDMap.cc

index c588bae7727734688da6d40c7f9b305f3daef647..688efe683dae89e27cfff58894aebc7cce152f79 100644 (file)
@@ -5023,7 +5023,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;