]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: ignore already dumped osd in dump_item() 40249/head
authorjhonxue <jhonxue@tencent.com>
Fri, 5 Mar 2021 15:33:10 +0000 (23:33 +0800)
committersinguliere <singuliere@autistici.org>
Fri, 19 Mar 2021 18:11:20 +0000 (19:11 +0100)
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 4e0fab932af12fa7c875811b8de9c365d3c4998a..e720a5ebd1b17c6ec712e3b46d9df7da8228caac 100644 (file)
@@ -5229,7 +5229,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;