From: Patrick Donnelly <pdonnell@redhat.com>
Date: Sat, 18 Jul 2020 03:28:03 +0000 (-0700)
Subject: Merge PR #35969 into master
X-Git-Tag: v16.1.0~1689
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=66b9bf0cd8e01b6602fa7503ce9b2a14b4e3a4e1;p=ceph.git

Merge PR #35969 into master

* refs/pull/35969/head:
	mds: optimize random threshold lookup for dentry load

Reviewed-by: Sidharth Anupkrishnan <sanupkri@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
---

66b9bf0cd8e01b6602fa7503ce9b2a14b4e3a4e1
diff --cc src/mds/CDir.cc
index 548a8c8a2caf,f3e20e0972f5..c052a4a16b95
mode 100755,100644..100755
--- a/src/mds/CDir.cc
+++ b/src/mds/CDir.cc
diff --cc src/mds/CDir.h
index 52e01001b147,ca27e32e1863..a907836aa51e
--- a/src/mds/CDir.h
+++ b/src/mds/CDir.h
@@@ -646,8 -646,14 +646,9 @@@ protected
        ceph::buffer::list &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)
     */