From: Ilya Dryomov Date: Sun, 28 Jun 2020 10:10:54 +0000 (+0000) Subject: msg/async/ProtocolV2: always print server_cookie in hex X-Git-Tag: v14.2.11~8^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6f63994dcc6542d7f55917ebb14db0f84d357d3d;p=ceph.git msg/async/ProtocolV2: always print server_cookie in hex 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 (cherry picked from commit 779a8df7546b8b0850729c8b266df327fb60d15b) --- diff --git a/src/msg/async/ProtocolV2.cc b/src/msg/async/ProtocolV2.cc index 1635e9276b98..f5c904544dd9 100644 --- a/src/msg/async/ProtocolV2.cc +++ b/src/msg/async/ProtocolV2.cc @@ -2030,8 +2030,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 @@ -2770,8 +2770,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,