From 7c51f75ed77a0ac17c2abc1d2da98a9ab139969c Mon Sep 17 00:00:00 2001 From: Samarah Date: Wed, 18 Jun 2025 18:54:24 +0000 Subject: [PATCH] test/d4n: Add dout initalization during env setup Signed-off-by: Samarah --- src/test/rgw/test_d4n_policy.cc | 11 +++++------ src/test/rgw/test_ssd_driver.cc | 13 ++++++------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/test/rgw/test_d4n_policy.cc b/src/test/rgw/test_d4n_policy.cc index 04ece864e7f..eb1f6f42c8a 100644 --- a/src/test/rgw/test_d4n_policy.cc +++ b/src/test/rgw/test_d4n_policy.cc @@ -27,14 +27,13 @@ class Environment : public ::testing::Environment { void SetUp() override { std::vector args; - std::string conf_file_list; - std::string cluster = ""; - CephInitParameters iparams = ceph_argparse_early_args( - args, CEPH_ENTITY_TYPE_CLIENT, - &cluster, &conf_file_list); + auto _cct = global_init(nullptr, args, CEPH_ENTITY_TYPE_CLIENT, + CODE_ENVIRONMENT_UTILITY, + CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); - cct = common_preinit(iparams, CODE_ENVIRONMENT_UTILITY, {}); + cct = _cct.get(); dpp = new DoutPrefix(cct->get(), dout_subsys, "D4N Object Directory Test: "); + common_init_finish(g_ceph_context); redisHost = cct->_conf->rgw_d4n_address; } diff --git a/src/test/rgw/test_ssd_driver.cc b/src/test/rgw/test_ssd_driver.cc index e0cdace51a2..1ab3009acc2 100644 --- a/src/test/rgw/test_ssd_driver.cc +++ b/src/test/rgw/test_ssd_driver.cc @@ -70,14 +70,13 @@ class Environment : public ::testing::Environment { void SetUp() override { std::vector args; - std::string conf_file_list; - std::string cluster = ""; - CephInitParameters iparams = ceph_argparse_early_args( - args, CEPH_ENTITY_TYPE_CLIENT, - &cluster, &conf_file_list); + auto _cct = global_init(nullptr, args, CEPH_ENTITY_TYPE_CLIENT, + CODE_ENVIRONMENT_UTILITY, + CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); - cct = common_preinit(iparams, CODE_ENVIRONMENT_UTILITY, {}); + cct = _cct.get(); dpp = new DoutPrefix(cct->get(), dout_subsys, "SSD backed Cache backend Test: "); + common_init_finish(g_ceph_context); } CephContext* cct; @@ -291,4 +290,4 @@ int main(int argc, char *argv[]) { ::testing::AddGlobalTestEnvironment(env); return RUN_ALL_TESTS(); -} \ No newline at end of file +} -- 2.39.5