crimson/net: cleanups as msgr only supports v2 protocol

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>

diff --git a/src/test/crimson/test_messenger.cc b/src/test/crimson/test_messenger.cc
index 8c603d4615b7077a1b6d5c05a0d20ddfd2f58dd2..8009d789c170b6077e8d4d8e6494663f7e5967ea 100644 (file)
--- a/src/test/crimson/test_messenger.cc
+++ b/src/test/crimson/test_messenger.cc
@@ -3458,8 +3458,8 @@ seastar::future<>
 test_v2_protocol(entity_addr_t test_addr,
                  entity_addr_t test_peer_addr,
                  bool test_peer_islocal) {
-  ceph_assert(test_addr.is_msgr2());
-  ceph_assert(test_peer_addr.is_msgr2());
+  ceph_assert_always(test_addr.is_msgr2());
+  ceph_assert_always(test_peer_addr.is_msgr2());
 
   if (test_peer_islocal) {
     // initiate crimson test peer locally
@@ -3591,20 +3591,20 @@ seastar::future<int> do_test(seastar::app_template& app)
     verbose = config["verbose"].as<bool>();
     auto rounds = config["rounds"].as<unsigned>();
     auto keepalive_ratio = config["keepalive-ratio"].as<double>();
-    entity_addr_t v2_test_addr;
-    ceph_assert(v2_test_addr.parse(
-        config["v2-test-addr"].as<std::string>().c_str(), nullptr));
-    entity_addr_t v2_testpeer_addr;
-    ceph_assert(v2_testpeer_addr.parse(
-        config["v2-testpeer-addr"].as<std::string>().c_str(), nullptr));
-    auto v2_testpeer_islocal = config["v2-testpeer-islocal"].as<bool>();
+    entity_addr_t test_addr;
+    ceph_assert(test_addr.parse(
+        config["test-addr"].as<std::string>().c_str(), nullptr));
+    entity_addr_t testpeer_addr;
+    ceph_assert(testpeer_addr.parse(
+        config["testpeer-addr"].as<std::string>().c_str(), nullptr));
+    auto testpeer_islocal = config["testpeer-islocal"].as<bool>();
     return test_echo(rounds, keepalive_ratio)
     .then([] {
       return test_concurrent_dispatch();
     }).then([] {
       return test_preemptive_shutdown();
-    }).then([v2_test_addr, v2_testpeer_addr, v2_testpeer_islocal] {
-      return test_v2_protocol(v2_test_addr, v2_testpeer_addr, v2_testpeer_islocal);
+    }).then([test_addr, testpeer_addr, testpeer_islocal] {
+      return test_v2_protocol(test_addr, testpeer_addr, testpeer_islocal);
     }).then([] {
       logger().info("All tests succeeded");
       // Seastar has bugs to have events undispatched during shutdown,
@@ -3631,12 +3631,12 @@ int main(int argc, char** argv)
      "number of pingpong rounds")
     ("keepalive-ratio", bpo::value<double>()->default_value(0.1),
      "ratio of keepalive in ping messages")
-    ("v2-test-addr", bpo::value<std::string>()->default_value("v2:127.0.0.1:9012"),
+    ("test-addr", bpo::value<std::string>()->default_value("v2:127.0.0.1:9012"),
      "address of v2 failover tests")
-    ("v2-testpeer-addr", bpo::value<std::string>()->default_value("v2:127.0.0.1:9013"),
+    ("testpeer-addr", bpo::value<std::string>()->default_value("v2:127.0.0.1:9013"),
      "addresses of v2 failover testpeer"
      " (CmdSrv address and TestPeer address with port+=1)")
-    ("v2-testpeer-islocal", bpo::value<bool>()->default_value(true),
+    ("testpeer-islocal", bpo::value<bool>()->default_value(true),
      "create a local crimson testpeer, or connect to a remote testpeer");
   return app.run(argc, argv, [&app] {
     // This test normally succeeds within 60 seconds, so kill it after 300

diff --git a/src/test/crimson/test_messenger_peer.cc b/src/test/crimson/test_messenger_peer.cc
index 7a270c08a7503b89feb7ae6637da28c898f9f153..956238cfe3bcff6b5c65cd8e472e75bab3ecf977 100644 (file)
--- a/src/test/crimson/test_messenger_peer.cc
+++ b/src/test/crimson/test_messenger_peer.cc
@@ -431,6 +431,7 @@ int main(int argc, char** argv)
   auto addr = vm["addr"].as<std::string>();
   entity_addr_t cmd_peer_addr;
   cmd_peer_addr.parse(addr.c_str(), nullptr);
+  ceph_assert_always(cmd_peer_addr.is_msgr2());
   auto nonstop = vm["nonstop"].as<bool>();
 
   std::vector<const char*> args(argv, argv + argc);

diff --git a/src/tools/crimson/perf_async_msgr.cc b/src/tools/crimson/perf_async_msgr.cc
index af8b9ec40afc9067cabc63a7ef9e9786a128704a..b7b0ca606d3545068cee32dec5b5b3a0b7b03041 100644 (file)
--- a/src/tools/crimson/perf_async_msgr.cc
+++ b/src/tools/crimson/perf_async_msgr.cc
@@ -90,12 +90,12 @@ int main(int argc, char** argv)
   po::options_description desc{"Allowed options"};
   desc.add_options()
     ("help,h", "show help message")
-    ("addr", po::value<std::string>()->default_value("v1:127.0.0.1:9010"),
-     "server address")
+    ("addr", po::value<std::string>()->default_value("v2:127.0.0.1:9010"),
+     "server address(crimson only supports msgr v2 protocol)")
     ("bs", po::value<unsigned>()->default_value(0),
      "server block size")
-    ("v1-crc-enabled", po::value<bool>()->default_value(false),
-     "enable v1 CRC checks");
+    ("crc-enabled", po::value<bool>()->default_value(false),
+     "enable CRC checks");
   po::variables_map vm;
   std::vector<std::string> unrecognized_options;
   try {
@@ -118,8 +118,9 @@ int main(int argc, char** argv)
   auto addr = vm["addr"].as<std::string>();
   entity_addr_t target_addr;
   target_addr.parse(addr.c_str(), nullptr);
+  ceph_assert_always(target_addr.is_msgr2());
   auto bs = vm["bs"].as<unsigned>();
-  auto v1_crc_enabled = vm["v1-crc-enabled"].as<bool>();
+  auto crc_enabled = vm["crc-enabled"].as<bool>();
 
   std::vector<const char*> args(argv, argv + argc);
   auto cct = global_init(nullptr, args,
@@ -128,7 +129,7 @@ int main(int argc, char** argv)
                          CINIT_FLAG_NO_MON_CONFIG);
   common_init_finish(cct.get());
 
-  if (v1_crc_enabled) {
+  if (crc_enabled) {
     cct->_conf.set_val("ms_crc_header", "true");
     cct->_conf.set_val("ms_crc_data", "true");
   } else {

diff --git a/src/tools/crimson/perf_crimson_msgr.cc b/src/tools/crimson/perf_crimson_msgr.cc
index 2f00a506d6fb508ce4cf9ad77299e7aa432b7f4a..e6b5b9a0508c76c3065d602b6037facd49711e3c 100644 (file)
--- a/src/tools/crimson/perf_crimson_msgr.cc
+++ b/src/tools/crimson/perf_crimson_msgr.cc
@@ -84,6 +84,7 @@ struct client_config {
     client_config conf;
     entity_addr_t addr;
     ceph_assert(addr.parse(options["addr"].as<std::string>().c_str(), nullptr));
+    ceph_assert_always(addr.is_msgr2());
 
     conf.server_addr = addr;
     conf.block_size = options["cbs"].as<unsigned>();
@@ -114,6 +115,7 @@ struct server_config {
     server_config conf;
     entity_addr_t addr;
     ceph_assert(addr.parse(options["addr"].as<std::string>().c_str(), nullptr));
+    ceph_assert_always(addr.is_msgr2());
 
     conf.addr = addr;
     conf.block_size = options["sbs"].as<unsigned>();