From: Yingxin Cheng Date: Wed, 28 Sep 2022 07:58:05 +0000 (+0800) Subject: crimson/net: drop the invalid crc configuration interfaces X-Git-Tag: v18.1.0~1057^2~2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=00d1ae7963a973c37b98a7ef37c88bedecfd135b;p=ceph.git crimson/net: drop the invalid crc configuration interfaces Signed-off-by: Yingxin Cheng --- diff --git a/src/crimson/net/Messenger.h b/src/crimson/net/Messenger.h index e7d57233a643..b9e56285e2a4 100644 --- a/src/crimson/net/Messenger.h +++ b/src/crimson/net/Messenger.h @@ -36,7 +36,6 @@ using Throttle = crimson::common::Throttle; using SocketPolicy = ceph::net::Policy; class Messenger { - uint32_t crc_flags = 0; crimson::auth::AuthClient* auth_client = nullptr; crimson::auth::AuthServer* auth_server = nullptr; bool require_authorizer = true; @@ -99,16 +98,6 @@ public: // and must be called if is bound. virtual seastar::future<> shutdown() = 0; - uint32_t get_crc_flags() const { - return crc_flags; - } - void set_crc_data() { - crc_flags |= MSG_CRC_DATA; - } - void set_crc_header() { - crc_flags |= MSG_CRC_HEADER; - } - crimson::auth::AuthClient* get_auth_client() const { return auth_client; } void set_auth_client(crimson::auth::AuthClient *ac) { auth_client = ac; diff --git a/src/crimson/osd/main.cc b/src/crimson/osd/main.cc index 42b9829fd484..cd74c6905048 100644 --- a/src/crimson/osd/main.cc +++ b/src/crimson/osd/main.cc @@ -109,16 +109,6 @@ static uint64_t get_nonce() } } -static void configure_crc_handling(crimson::net::Messenger& msgr) -{ - if (local_conf()->ms_crc_data) { - msgr.set_crc_data(); - } - if (local_conf()->ms_crc_header) { - msgr.set_crc_header(); - } -} - seastar::future<> fetch_config() { // i don't have any client before joining the cluster, so no need to have @@ -134,7 +124,6 @@ seastar::future<> fetch_config() auto msgr = crimson::net::Messenger::create(entity_name_t::CLIENT(), "temp_mon_client", get_nonce()); - configure_crc_handling(*msgr); crimson::mon::Client monc{*msgr, *auth_handler}; msgr->set_auth_client(&monc); msgr->start({&monc}).get(); @@ -299,7 +288,6 @@ int main(int argc, const char* argv[]) msgr = crimson::net::Messenger::create(entity_name_t::OSD(whoami), name, nonce); - configure_crc_handling(*msgr); } auto store = crimson::os::FuturizedStore::create( local_conf().get_val("osd_objectstore"), diff --git a/src/test/crimson/test_alien_echo.cc b/src/test/crimson/test_alien_echo.cc index 28df6d6bff3c..15f0347692b5 100644 --- a/src/test/crimson/test_alien_echo.cc +++ b/src/test/crimson/test_alien_echo.cc @@ -59,10 +59,7 @@ struct Server { Server(crimson::net::MessengerRef msgr) : byte_throttler(local_conf()->osd_client_message_size_cap), msgr{msgr} - { - msgr->set_crc_header(); - msgr->set_crc_data(); - } + { } }; struct Client { @@ -84,10 +81,7 @@ struct Client { Client(crimson::net::MessengerRef msgr) : byte_throttler(local_conf()->osd_client_message_size_cap), msgr{msgr} - { - msgr->set_crc_header(); - msgr->set_crc_data(); - } + { } }; } // namespace seastar_pingpong diff --git a/src/test/crimson/test_messenger_peer.cc b/src/test/crimson/test_messenger_peer.cc index 7b669675ba3a..7a270c08a750 100644 --- a/src/test/crimson/test_messenger_peer.cc +++ b/src/test/crimson/test_messenger_peer.cc @@ -439,8 +439,6 @@ int main(int argc, char** argv) CODE_ENVIRONMENT_UTILITY, CINIT_FLAG_NO_MON_CONFIG); common_init_finish(cct.get()); - cct->_conf.set_val("ms_crc_header", "false"); - cct->_conf.set_val("ms_crc_data", "false"); auto test_peer = FailoverTestPeer::create(cct.get(), cmd_peer_addr, nonstop); test_peer->wait(); diff --git a/src/test/crimson/test_monc.cc b/src/test/crimson/test_monc.cc index 6331f4d61a25..528c06aa6447 100644 --- a/src/test/crimson/test_monc.cc +++ b/src/test/crimson/test_monc.cc @@ -42,13 +42,6 @@ static seastar::future<> test_monc() return crimson::common::sharded_perf_coll().start(); }).then([]() mutable { auto msgr = crimson::net::Messenger::create(entity_name_t::OSD(0), "monc", 0); - auto& conf = crimson::common::local_conf(); - if (conf->ms_crc_data) { - msgr->set_crc_data(); - } - if (conf->ms_crc_header) { - msgr->set_crc_header(); - } msgr->set_require_authorizer(false); return seastar::do_with(MonClient{*msgr, dummy_handler}, [msgr](auto& monc) mutable { diff --git a/src/tools/crimson/perf_crimson_msgr.cc b/src/tools/crimson/perf_crimson_msgr.cc index 3efd22c4b4e2..2f00a506d6fb 100644 --- a/src/tools/crimson/perf_crimson_msgr.cc +++ b/src/tools/crimson/perf_crimson_msgr.cc @@ -67,7 +67,6 @@ struct client_config { unsigned msgtime; unsigned jobs; unsigned depth; - bool crc_enabled; std::string str() const { std::ostringstream out; @@ -77,7 +76,6 @@ struct client_config { << ", msgtime=" << msgtime << ", jobs=" << jobs << ", depth=" << depth - << ", crc-enabled=" << crc_enabled << ")"; return out.str(); } @@ -94,7 +92,6 @@ struct client_config { conf.jobs = options["jobs"].as(); conf.depth = options["depth"].as(); ceph_assert(conf.depth % conf.jobs == 0); - conf.crc_enabled = options["crc-enabled"].as(); return conf; } }; @@ -103,14 +100,12 @@ struct server_config { entity_addr_t addr; unsigned block_size; unsigned core; - bool crc_enabled; std::string str() const { std::ostringstream out; out << "server[" << addr << "](bs=" << block_size << ", core=" << core - << ", crc-enabled=" << crc_enabled << ")"; return out.str(); } @@ -123,7 +118,6 @@ struct server_config { conf.addr = addr; conf.block_size = options["sbs"].as(); conf.core = options["core"].as(); - conf.crc_enabled = options["crc-enabled"].as(); return conf; } }; @@ -133,7 +127,8 @@ const unsigned SAMPLE_RATE = 7; static seastar::future<> run( perf_mode_t mode, const client_config& client_conf, - const server_config& server_conf) + const server_config& server_conf, + bool crc_enabled) { struct test_state { struct Server; @@ -174,17 +169,13 @@ static seastar::future<> run( return {seastar::now()}; } - seastar::future<> init(bool crc_enabled, const entity_addr_t& addr) { - return seastar::smp::submit_to(msgr_sid, [crc_enabled, addr, this] { + seastar::future<> init(const entity_addr_t& addr) { + return seastar::smp::submit_to(msgr_sid, [addr, this] { // server msgr is always with nonce 0 msgr = crimson::net::Messenger::create(entity_name_t::OSD(msgr_sid), lname, 0); msgr->set_default_policy(crimson::net::SocketPolicy::stateless_server(0)); msgr->set_auth_client(&dummy_auth); msgr->set_auth_server(&dummy_auth); - if (crc_enabled) { - msgr->set_crc_header(); - msgr->set_crc_data(); - } return msgr->bind(entity_addrvec_t{addr}).safe_then([this] { return msgr->start({this}); }, crimson::net::Messenger::bind_ertr::all_same_way( @@ -340,18 +331,14 @@ static seastar::future<> run( return sid != 0 && sid <= jobs; } - seastar::future<> init(bool crc_enabled) { - return container().invoke_on_all([crc_enabled] (auto& client) { + seastar::future<> init() { + return container().invoke_on_all([] (auto& client) { if (client.is_active()) { client.msgr = crimson::net::Messenger::create(entity_name_t::OSD(client.sid), client.lname, client.sid); client.msgr->set_default_policy(crimson::net::SocketPolicy::lossy_client(0)); client.msgr->set_require_authorizer(false); client.msgr->set_auth_client(&client.dummy_auth); client.msgr->set_auth_server(&client.dummy_auth); - if (crc_enabled) { - client.msgr->set_crc_header(); - client.msgr->set_crc_data(); - } return client.msgr->start({&client}); } return seastar::now(); @@ -657,6 +644,9 @@ static seastar::future<> run( create_sharded(client_conf.jobs, client_conf.block_size, client_conf.depth), crimson::common::sharded_conf().start(EntityName{}, std::string_view{"ceph"}).then([] { return crimson::common::local_conf().start(); + }).then([crc_enabled] { + return crimson::common::local_conf().set_val( + "ms_crc_data", crc_enabled ? "true" : "false"); }) ).then([=](auto&& ret) { auto fp_server = std::move(std::get<0>(ret).get0()); @@ -670,8 +660,8 @@ static seastar::future<> run( ceph_assert(seastar::smp::count >= 1+server_conf.core); ceph_assert(server_conf.core == 0 || server_conf.core > client_conf.jobs); return seastar::when_all_succeed( - server->init(server_conf.crc_enabled, server_conf.addr), - client->init(client_conf.crc_enabled) + server->init(server_conf.addr), + client->init() ).then_unpack([client, addr = client_conf.server_addr] { return client->connect_wait_verify(addr); }).then([client, ramptime = client_conf.ramptime, @@ -686,7 +676,7 @@ static seastar::future<> run( logger().info("\nperf settings:\n {}\n", client_conf.str()); ceph_assert(seastar::smp::count >= 1+client_conf.jobs); ceph_assert(client_conf.jobs > 0); - return client->init(client_conf.crc_enabled + return client->init( ).then([client, addr = client_conf.server_addr] { return client->connect_wait_verify(addr); }).then([client, ramptime = client_conf.ramptime, @@ -698,7 +688,7 @@ static seastar::future<> run( } else { // mode == perf_mode_t::server ceph_assert(seastar::smp::count >= 1+server_conf.core); logger().info("\nperf settings:\n {}\n", server_conf.str()); - return server->init(server_conf.crc_enabled, server_conf.addr + return server->init(server_conf.addr // dispatch ops ).then([server] { return server->wait(); @@ -743,9 +733,11 @@ int main(int argc, char** argv) auto mode = config["mode"].as(); ceph_assert(mode <= 2); auto _mode = static_cast(mode); + bool crc_enabled = config["crc-enabled"].as(); auto server_conf = server_config::load(config); auto client_conf = client_config::load(config); - return run(_mode, client_conf, server_conf).then([] { + return run(_mode, client_conf, server_conf, crc_enabled + ).then([] { logger().info("\nsuccessful!\n"); }).handle_exception([] (auto eptr) { logger().info("\nfailed!\n");