From: Kefu Chai <kchai@redhat.com>
Date: Sat, 17 Jul 2021 02:05:08 +0000 (+0800)
Subject: test/crimson/test_alien_echo: drop msgr v1 support
X-Git-Tag: v17.1.0~1379^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f6c679a533aa0d51c4ba992758720e45687794df;p=ceph.git

test/crimson/test_alien_echo: drop msgr v1 support

crimson msgr dropped the v1 support back in
7a7e869c0a7d96e1e242929755c3af73085d00ac. so there is no point to offer
an option to use v1 protocol.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/test/crimson/test_alien_echo.cc b/src/test/crimson/test_alien_echo.cc
index 1a101c1738e2..ea2e1a37c284 100644
--- a/src/test/crimson/test_alien_echo.cc
+++ b/src/test/crimson/test_alien_echo.cc
@@ -240,9 +240,7 @@ int main(int argc, char** argv)
     ("nonce", po::value<uint32_t>()->default_value(42),
      "a unique number to identify the pong server")
     ("count", po::value<unsigned>()->default_value(10),
-     "stop after sending/echoing <count> MPing messages")
-    ("v2", po::value<bool>()->default_value(false),
-     "using msgr v2 protocol");
+     "stop after sending/echoing <count> MPing messages");
   po::variables_map vm;
   std::vector<std::string> unrecognized_options;
   try {
@@ -263,11 +261,7 @@ int main(int argc, char** argv)
   }
 
   entity_addr_t addr;
-  if (vm["v2"].as<bool>()) {
-    addr.set_type(entity_addr_t::TYPE_MSGR2);
-  } else {
-    addr.set_type(entity_addr_t::TYPE_LEGACY);
-  }
+  addr.set_type(entity_addr_t::TYPE_MSGR2);
   addr.set_family(AF_INET);
   addr.set_port(vm["port"].as<std::uint16_t>());
   addr.set_nonce(vm["nonce"].as<std::uint32_t>());