msg/Pipe: be a bit more explicit about encoding outgoing messages

Signed-off-by: Sage Weil <sage@inktank.com>
(cherry picked from commit 4282971d47b90484e681ff1a71ae29569dbd1d32)

diff --git a/src/msg/Pipe.cc b/src/msg/Pipe.cc
index 16b6de8850202ef021963da76653668e5abda58f..3e2894bdf857664caa89d38fac23d883bd5dc861 100644 (file)
--- a/src/msg/Pipe.cc
+++ b/src/msg/Pipe.cc
@@ -1517,10 +1517,16 @@ void Pipe::writer()
        // associate message with Connection (for benefit of encode_payload)
        m->set_connection(connection_state->get());
 
-        ldout(msgr->cct,20) << "writer encoding " << m->get_seq() << " " << m << " " << *m << dendl;
+       uint64_t features = connection_state->get_features();
+       if (m->empty_payload())
+         ldout(msgr->cct,20) << "writer encoding " << m->get_seq() << " features " << features
+                             << " " << m << " " << *m << dendl;
+       else
+         ldout(msgr->cct,20) << "writer half-reencoding " << m->get_seq() << " features " << features
+                             << " " << m << " " << *m << dendl;
 
        // encode and copy out of *m
-       m->encode(connection_state->get_features(), !msgr->cct->_conf->ms_nocrc);
+       m->encode(features, !msgr->cct->_conf->ms_nocrc);
 
        // prepare everything
        ceph_msg_header& header = m->get_header();