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>

diff --cc src/mds/CDir.cc
index f145bc1d112e78ff887fc6241f0dc23691442a63,f291d82ffc1f4cb75dd165dfe736bec2bb97244c..9c06cc2af80156e3848cf576e7340cfdbe27161f
mode 100755,100644..100755
--- 1/src/mds/CDir.cc
--- 2/src/mds/CDir.cc
+++ b/src/mds/CDir.cc

diff --cc src/mds/CDir.h
index 42f1feedfb35a74c07c64247b09e750f719aef18,436a2e060a6923512892e3b5bd51911dbf876100..9a4dd50ffd0e0710aa6a3f89988c8c62daec0f41
--- 1/src/mds/CDir.h
--- 2/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)
     */

diff --cc src/mds/CInode.cc
Simple merge

diff --cc src/mds/CInode.h
Simple merge