From a7dcf40ef18d1b8bfc64014b38ffaf613a086e58 Mon Sep 17 00:00:00 2001 From: Mykola Golub Date: Thu, 6 May 2021 17:45:52 +0100 Subject: [PATCH] test/cls_rgw: make bi_list test not rely on osd_max_omap_entries_per_request Signed-off-by: Mykola Golub (cherry picked from commit d02d91f6f20a3431fd758a67a0bf77ea4bd4d883) --- src/test/cls_rgw/test_cls_rgw.cc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/test/cls_rgw/test_cls_rgw.cc b/src/test/cls_rgw/test_cls_rgw.cc index 207973cde7f1..3b340f7a3c4f 100644 --- a/src/test/cls_rgw/test_cls_rgw.cc +++ b/src/test/cls_rgw/test_cls_rgw.cc @@ -596,8 +596,8 @@ TEST_F(cls_rgw, bi_list) ret = cls_rgw_bi_list(ioctx, bucket_oid, name, marker, num_objs + 10, &entries, &is_truncated); ASSERT_EQ(ret, 0); - if (cct->_conf->osd_max_omap_entries_per_request < num_objs) { - ASSERT_EQ(entries.size(), cct->_conf->osd_max_omap_entries_per_request); + if (is_truncated) { + ASSERT_LT(entries.size(), num_objs); } else { ASSERT_EQ(entries.size(), num_objs); } @@ -610,8 +610,7 @@ TEST_F(cls_rgw, bi_list) &is_truncated); ASSERT_EQ(ret, 0); if (is_truncated) { - ASSERT_EQ(entries.size(), - std::min(max, cct->_conf->osd_max_omap_entries_per_request)); + ASSERT_LT(entries.size(), num_objs - num_entries); } else { ASSERT_EQ(entries.size(), num_objs - num_entries); } @@ -635,7 +634,7 @@ TEST_F(cls_rgw, bi_list) &is_truncated); ASSERT_EQ(ret, 0); if (is_truncated) { - ASSERT_EQ(entries.size(), cct->_conf->osd_max_omap_entries_per_request); + ASSERT_LT(entries.size(), num_objs - num_entries); } else { ASSERT_EQ(entries.size(), num_objs - num_entries); } -- 2.47.3