From: Yuri Weinstein <yweinste@redhat.com>
Date: Tue, 20 Oct 2020 15:20:19 +0000 (-0700)
Subject: Merge pull request #37247 from Vicente-Cheng/wip-46637-octopus
X-Git-Tag: v15.2.9~122^2~25
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e9186e95cfc9880fa0b82ea00f2fd71aa699dae9;p=ceph.git

Merge pull request #37247 from Vicente-Cheng/wip-46637-octopus

octopus: mds: optimize random threshold lookup for dentry load

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
---

e9186e95cfc9880fa0b82ea00f2fd71aa699dae9
diff --cc src/mds/CDir.cc
index f145bc1d112,f291d82ffc1..9c06cc2af80
mode 100755,100644..100755
--- a/src/mds/CDir.cc
+++ b/src/mds/CDir.cc
diff --cc src/mds/CDir.h
index 42f1feedfb3,436a2e060a6..9a4dd50ffd0
--- a/src/mds/CDir.h
+++ b/src/mds/CDir.h
@@@ -644,8 -644,14 +644,9 @@@ protected
        bufferlist &bl,
        int pos,
        const std::set<snapid_t> *snaps,
+       double rand_threshold,
        bool *force_dirty);
  
 -  /**
 -   * Mark this fragment as BADFRAG (common part of go_bad and go_bad_dentry)
 -   */
 -  void _go_bad();
 -
    /**
     * Go bad due to a damaged dentry (register with damagetable and go BADFRAG)
     */