From 4010c4f24d58512e0fc35355d5574dc4a2ca0fd8 Mon Sep 17 00:00:00 2001 From: chunmei-liu Date: Fri, 8 Jul 2022 01:52:09 -0700 Subject: [PATCH] crimson/seastore: fix test_seastore collection default has pool(0), and NO_SHARD, so the ghobject_t should have the same setting. and ghobject_t default hash not within 1<<(32-4), so set collection bits to be 0. Signed-off-by: chunmei-liu --- src/test/crimson/seastore/test_seastore.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/test/crimson/seastore/test_seastore.cc b/src/test/crimson/seastore/test_seastore.cc index 514b19c6a47..be730e7ec6b 100644 --- a/src/test/crimson/seastore/test_seastore.cc +++ b/src/test/crimson/seastore/test_seastore.cc @@ -42,7 +42,7 @@ struct seastore_test_t : }).then([this](auto coll_ref) { coll = coll_ref; CTransaction t; - t.create_collection(coll_name, 4); + t.create_collection(coll_name, 0); return seastore->do_transaction( coll, std::move(t)); @@ -423,8 +423,9 @@ ghobject_t make_oid(int i) { auto ret = ghobject_t( hobject_t( sobject_t(ss.str(), CEPH_NOSNAP))); - ret.set_shard(shard_id_t(0)); + ret.set_shard(shard_id_t(shard_id_t::NO_SHARD)); ret.hobj.nspace = "asdf"; + ret.hobj.pool = 0; return ret; } -- 2.39.5