]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #35969 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Sat, 18 Jul 2020 03:28:03 +0000 (20:28 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Sat, 18 Jul 2020 03:28:03 +0000 (20:28 -0700)
* 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>
1  2 
src/mds/CDir.cc
src/mds/CDir.h
src/mds/CInode.h

diff --cc src/mds/CDir.cc
index 548a8c8a2caff672c2327500c8e3bf473c4a0abf,f3e20e0972f565f735ec3dc7169ba9b1beaf3b95..c052a4a16b95c7ac6f783342beba66bebb324ca3
mode 100755,100644..100755
diff --cc src/mds/CDir.h
index 52e01001b147fa09d7667f7b4664b043c4589ef5,ca27e32e18630debe62d460c909584f8959c8507..a907836aa51eb6b05a9bfdf0dd4f34d8973a6b2b
@@@ -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)
     */
Simple merge