Skip to content

Commit 9b3bfb6

Browse files
committed
Merge PR ceph#65483 into main
* refs/pull/65483/head: Reviewed-by: Patrick Donnelly <[email protected]> Reviewed-by: Venky Shankar <[email protected]>
2 parents 7ce4252 + adb448b commit 9b3bfb6

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/mds/MDSRank.cc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2049,8 +2049,9 @@ void MDSRank::rejoin_done()
20492049

20502050
// funny case: is our cache empty? no subtrees?
20512051
if (!mdcache->is_subtrees()) {
2052-
if (whoami == 0) {
2053-
// The root should always have a subtree!
2052+
if (whoami == 0 && mdlog->get_num_events() > 1) {
2053+
// The root should always have a subtree except when
2054+
// the mdlog contains only the ELid event
20542055
clog->error() << "No subtrees found for root MDS rank!";
20552056
damaged();
20562057
ceph_assert(mdcache->is_subtrees());

0 commit comments

Comments
 (0)