]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: ignore already dumped osd in dump_item() 40788/head
authorjhonxue <jhonxue@tencent.com>
Fri, 5 Mar 2021 15:33:10 +0000 (23:33 +0800)
committerNathan Cutler <ncutler@suse.com>
Sun, 11 Apr 2021 10:07:54 +0000 (12:07 +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 9e53fa0b6f8be5c54a8142247f925b72bf7cf355..02a2e3d53cdde30f90f7f96a3d212eb99d3cdcc2 100644 (file)
@@ -5155,7 +5155,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;