gian/ceph-mirror
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2026-08-02 07:03:18 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge PR #68413 into main

Browse Source 
* refs/pull/68413/head:
	mds: fix shutdown hang when ephemeral pins active and max_mds is 0
	mds: fix crash in hash_into_rank_bucket() when max_mds is 0

Reviewed-by: Patrick Donnelly <pdonnell@ibm.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
This commit is contained in:
Venky Shankar 2026-06-09 07:02:00 +05:30
commit aed8065a54
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mds/MDCache.cc
View File

@ -940,6 +940,8 @@ MDSCacheObject *MDCache::get_object(const MDSCacheObjectInfo &info)
mds_rank_t MDCache::hash_into_rank_bucket(inodeno_t ino, frag_t fg)
{
const mds_rank_t max_mds = mds->mdsmap->get_max_mds();
if (max_mds == 0)
return MDS_RANK_NONE;
uint64_t hash = rjhash64(ino);
if (fg)
hash = rjhash64(hash + rjhash64(fg.value()));
@ -8016,7 +8018,8 @@ bool MDCache::shutdown_pass()
dir->is_freezing() ||
dir->is_ambiguous_dir_auth() ||
dir->state_test(CDir::STATE_EXPORTING) ||
dir->get_inode()->is_ephemerally_pinned()) {
(mds->mdsmap->get_max_mds() > 0 &&
dir->get_inode()->is_ephemerally_pinned())) {
continue;
}
ls.push_back(dir);