]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
crimson/net: fix nonce setting in test_alien_echo
authorYingxin Cheng <yingxincheng@gmail.com>
Wed, 13 Feb 2019 03:38:17 +0000 (11:38 +0800)
committerYingxin Cheng <yingxincheng@gmail.com>
Wed, 13 Feb 2019 03:38:17 +0000 (11:38 +0800)
Signed-off-by: Yingxin Cheng <yingxincheng@gmail.com>
src/test/crimson/test_alien_echo.cc

index 26b756d2bedac42427950fd33c016aeb4ae17bee..64321c05e188810d23823d8d80b4a912fc90da9b 100644 (file)
@@ -275,8 +275,8 @@ seastar_echo(const entity_addr_t addr, echo_role role, unsigned count)
 {
   std::cout << "seastar/";
   if (role == echo_role::as_server) {
-    return ceph::net::Messenger::create(entity_name_t::OSD(0), "server", 0,
-                                        seastar::engine().cpu_id())
+    return ceph::net::Messenger::create(entity_name_t::OSD(0), "server",
+                                        addr.get_nonce(), 0)
       .then([addr, count] (auto msgr) {
         return seastar::do_with(seastar_pingpong::Server{*msgr},
           [addr, count](auto& server) mutable {
@@ -298,8 +298,8 @@ seastar_echo(const entity_addr_t addr, echo_role role, unsigned count)
           });
       });
   } else {
-    return ceph::net::Messenger::create(entity_name_t::OSD(1), "client", 1,
-                                        seastar::engine().cpu_id())
+    return ceph::net::Messenger::create(entity_name_t::OSD(1), "client",
+                                        addr.get_nonce(), 0)
       .then([addr, count] (auto msgr) {
         return seastar::do_with(seastar_pingpong::Client{*msgr},
           [addr, count](auto& client) {