From: Yingxin Cheng <yingxincheng@gmail.com>
Date: Wed, 13 Feb 2019 03:38:17 +0000 (+0800)
Subject: crimson/net: fix nonce setting in test_alien_echo
X-Git-Tag: v14.1.0~124^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1f9f0b976c96f44e4c965ee0fecf867882d464d3;p=ceph.git

crimson/net: fix nonce setting in test_alien_echo

Signed-off-by: Yingxin Cheng <yingxincheng@gmail.com>
---

diff --git a/src/test/crimson/test_alien_echo.cc b/src/test/crimson/test_alien_echo.cc
index 26b756d2beda..64321c05e188 100644
--- a/src/test/crimson/test_alien_echo.cc
+++ b/src/test/crimson/test_alien_echo.cc
@@ -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) {