This is an automated email from the ASF dual-hosted git repository.
djoshi pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/trunk by this push:
new 0a860b9 Fix regression with traceOutgoingMessage printing message
size.
0a860b9 is described below
commit 0a860b9b3e66be443b2236454c0f8c97c936a6dc
Author: Jon Meredith <[email protected]>
AuthorDate: Tue Jan 17 18:49:39 2017 -0500
Fix regression with traceOutgoingMessage printing message size.
Patch by Jon Meredith; Reviewed by Dinesh Joshi for CASSANDRA-15687
---
CHANGES.txt | 1 +
src/java/org/apache/cassandra/net/OutboundConnection.java | 4 ++--
src/java/org/apache/cassandra/tracing/Tracing.java | 5 +++--
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index 2537584..c43414d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
4.0-alpha4
+ * Fix regression with traceOutgoingMessage printing message size
(CASSANDRA-15687)
* Ensure repaired data tracking reads a consistent amount of data across
replicas (CASSANDRA-15601)
* Fix CQLSH to avoid arguments being evaluated (CASSANDRA-15660)
* Correct Visibility and Improve Safety of Methods in LatencyMetrics
(CASSANDRA-15597)
diff --git a/src/java/org/apache/cassandra/net/OutboundConnection.java
b/src/java/org/apache/cassandra/net/OutboundConnection.java
index 9661e8e..0503259 100644
--- a/src/java/org/apache/cassandra/net/OutboundConnection.java
+++ b/src/java/org/apache/cassandra/net/OutboundConnection.java
@@ -795,7 +795,7 @@ public class OutboundConnection
out = new DataOutputBufferFixed(sending.buffer);
}
- Tracing.instance.traceOutgoingMessage(next,
settings.connectTo);
+ Tracing.instance.traceOutgoingMessage(next,
messageSize, settings.connectTo);
Message.serializer.serialize(next, out,
messagingVersion);
if (sending.length() != sendingBytes + messageSize)
@@ -963,7 +963,7 @@ public class OutboundConnection
if (messageSize >
DatabaseDescriptor.getInternodeMaxMessageSizeInBytes())
throw new Message.OversizedMessageException(messageSize);
- Tracing.instance.traceOutgoingMessage(send,
established.settings.connectTo);
+ Tracing.instance.traceOutgoingMessage(send, messageSize,
established.settings.connectTo);
Message.serializer.serialize(send, out,
established.messagingVersion);
if (out.position() != messageSize)
diff --git a/src/java/org/apache/cassandra/tracing/Tracing.java
b/src/java/org/apache/cassandra/tracing/Tracing.java
index 5891981..311685b 100644
--- a/src/java/org/apache/cassandra/tracing/Tracing.java
+++ b/src/java/org/apache/cassandra/tracing/Tracing.java
@@ -273,7 +273,7 @@ public abstract class Tracing implements
ExecutorLocal<TraceState>
/**
* Record any tracing data, if enabled on this message.
*/
- public void traceOutgoingMessage(Message<?> message, InetAddressAndPort
sendTo)
+ public void traceOutgoingMessage(Message<?> message, int serializedSize,
InetAddressAndPort sendTo)
{
try
{
@@ -281,7 +281,8 @@ public abstract class Tracing implements
ExecutorLocal<TraceState>
if (sessionId == null)
return;
- String logMessage = String.format("Sending %s message to %s",
message.verb(), sendTo);
+ String logMessage = String.format("Sending %s message to %s
message size %d bytes", message.verb(), sendTo,
+ serializedSize);
TraceState state = get(sessionId);
if (state == null) // session may have already finished; see
CASSANDRA-5668
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
