From 92b2516db2d674cbd2127b8743a16160d802a0ac Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Mon, 1 Dec 2025 15:12:16 -0500 Subject: [PATCH] common/frag: produce valid fragments for test instances Signed-off-by: Patrick Donnelly (cherry picked from commit 4fb5ad4a258a3c447e9d7413ce87fcdf6a89d056) Conflicts: src/common/frag.cc: missing test instance refactor src/mds/mdstypes.cc: missing test instance refactor --- src/common/frag.cc | 6 +++--- src/mds/mdstypes.cc | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/common/frag.cc b/src/common/frag.cc index 452f30ff5dc..aa7e94fe813 100644 --- a/src/common/frag.cc +++ b/src/common/frag.cc @@ -46,9 +46,9 @@ void frag_t::dump(ceph::Formatter *f) const { } void frag_t::generate_test_instances(std::list& ls) { - ls.push_back(new frag_t); - ls.push_back(new frag_t(10, 2)); - ls.push_back(new frag_t(11, 3)); + ls.emplace_back(new frag_t); + ls.push_back(new frag_t((1<<22), 2)); + ls.push_back(new frag_t((1<<21), 3)); } std::ostream& operator<<(std::ostream& out, const frag_t& hb) diff --git a/src/mds/mdstypes.cc b/src/mds/mdstypes.cc index 5be3506bc3d..40118247902 100644 --- a/src/mds/mdstypes.cc +++ b/src/mds/mdstypes.cc @@ -842,12 +842,12 @@ void MDSCacheObjectInfo::generate_test_instances(std::list& ls.push_back(new MDSCacheObjectInfo); ls.push_back(new MDSCacheObjectInfo); ls.back()->ino = 1; - ls.back()->dirfrag = dirfrag_t(2, 3); + ls.back()->dirfrag = dirfrag_t(2, frag_t((1<<22), 2)); ls.back()->dname = "fooname"; ls.back()->snapid = CEPH_NOSNAP; ls.push_back(new MDSCacheObjectInfo); ls.back()->ino = 121; - ls.back()->dirfrag = dirfrag_t(222, 0); + ls.back()->dirfrag = dirfrag_t(222, frag_t((1<<19), 8)); ls.back()->dname = "bar foo"; ls.back()->snapid = 21322; } @@ -920,8 +920,8 @@ void dirfrag_t::dump(ceph::Formatter *f) const { void dirfrag_t::generate_test_instances(std::list& ls) { ls.push_back(new dirfrag_t); - ls.push_back(new dirfrag_t(1, frag_t())); - ls.push_back(new dirfrag_t(2, frag_t(3))); + ls.push_back(new dirfrag_t(1, frag_t((1<<23), 2))); + ls.push_back(new dirfrag_t(2, frag_t())); } /* -- 2.47.3