From 600ed4f5a894941b5c10fcf5569777c21c86e600 Mon Sep 17 00:00:00 2001 From: Xiubo Li Date: Wed, 17 May 2023 21:06:16 +0800 Subject: [PATCH] mds: do not send split_realms for CEPH_SNAP_OP_UPDATE msg The clients won't care about the split_realms and the kclient will treat this as a corrupted snaptrace. Fixes commit 93e7267757508520dfc22cff1ab20558bd4a44d4 ("mds: send snap related messages centrally during mds recovery") Fixes: https://tracker.ceph.com/issues/61217 Signed-off-by: Xiubo Li (cherry picked from commit 2131e1d2e04ba671f372bc651c416b93d2f6ae0d) Conflicts: - Misses a dependent commit 7a4c509f7289ff4 --- src/mds/MDCache.cc | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc index dc06d059670ab0..662cc145c70dd7 100644 --- a/src/mds/MDCache.cc +++ b/src/mds/MDCache.cc @@ -6023,8 +6023,6 @@ void MDCache::finish_snaprealm_reconnect(client_t client, SnapRealm *realm, snap << realm->get_newest_seq() << " on " << *realm << dendl; auto snap = make_message(CEPH_SNAP_OP_UPDATE); snap->bl = realm->get_snap_trace(); - for (const auto& child : realm->open_children) - snap->split_realms.push_back(child->inode->ino()); updates.emplace(std::piecewise_construct, std::forward_as_tuple(client), std::forward_as_tuple(snap)); } else { dout(10) << "finish_snaprealm_reconnect client." << client << " up to date"