From: Xiubo Li Date: Wed, 17 May 2023 13:06:16 +0000 (+0800) Subject: mds: do not send split_realms for CEPH_SNAP_OP_UPDATE msg X-Git-Tag: v17.2.7~90^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4f42a58835796e61034b8dfe2ab4ad6674e9af6c;p=ceph.git 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 3be9c9796246eab96f672218d9e45f118f6cdf12) Conflicts: - Misses a dependent commit 7a4c509f7289ff4 --- diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc index eba2265242b3..e76a96b2a53a 100644 --- a/src/mds/MDCache.cc +++ b/src/mds/MDCache.cc @@ -6034,8 +6034,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"