]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #37428 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Thu, 24 Dec 2020 04:35:39 +0000 (20:35 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Thu, 24 Dec 2020 04:35:39 +0000 (20:35 -0800)
* refs/pull/37428/head:
mds: move duplicated inner loop out
mds: try to replicate hot dir to restarted MDS

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Sidharth Anupkrishnan <sanupkri@redhat.com>
1  2 
src/mds/CDir.cc
src/mds/CDir.h
src/mds/MDBalancer.cc
src/mds/MDCache.cc

diff --cc src/mds/CDir.cc
index b78cd0096505972138e681c1c2dd036bda0c6d9e,fb55170e8e0dd7f617e52cf016c6ae476a88480c..1da9103158fbfe65cda942da855e416fdb1a7d0f
mode 100644,100755..100644
diff --cc src/mds/CDir.h
Simple merge
Simple merge
Simple merge