]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
msg/async/ProtocolV2: always print server_cookie in hex
authorIlya Dryomov <idryomov@gmail.com>
Sun, 28 Jun 2020 10:10:54 +0000 (10:10 +0000)
committerIlya Dryomov <idryomov@gmail.com>
Thu, 2 Jul 2020 11:17:28 +0000 (13:17 +0200)
Currently it's a mix of hex and dec, making it hard to grep for.
Converge on hex to match client_cookie.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit 779a8df7546b8b0850729c8b266df327fb60d15b)

src/msg/async/ProtocolV2.cc

index 65f5564e5d3a7fbb98a0b768212e8c4883297a13..cb2ca09b162969865794d410a36f3073f324eccc 100644 (file)
@@ -2047,8 +2047,8 @@ CtPtr ProtocolV2::handle_server_ident(ceph::bufferlist &payload)
                 << " features_supported=" << std::hex
                 << server_ident.supported_features()
                 << " features_required=" << server_ident.required_features()
-                << " flags=" << server_ident.flags() << " cookie=" << std::dec
-                << server_ident.cookie() << dendl;
+                << " flags=" << server_ident.flags()
+                << " cookie=" << server_ident.cookie() << std::dec << dendl;
 
   // is this who we intended to talk to?
   // be a bit forgiving here, since we may be connecting based on addresses parsed out
@@ -2794,8 +2794,8 @@ CtPtr ProtocolV2::send_server_ident() {
                 << connection->policy.features_supported
                 << " features_required="
                            << (connection->policy.features_required | msgr2_required)
-                << " flags=" << flags << " cookie=" << std::dec << server_cookie
-                << dendl;
+                << " flags=" << flags
+                << " cookie=" << server_cookie << std::dec << dendl;
 
   connection->lock.unlock();
   // Because "replacing" will prevent other connections preempt this addr,