You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2016/12/12 18:32:23 UTC
[1/3] cassandra git commit: Log message size in trace message in
OutboundTcpConnection
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.X c0e7110f9 -> 07f990bc2
refs/heads/trunk 9c0fa054a -> 5364310bf
Log message size in trace message in OutboundTcpConnection
patch by aweisberg; reviewed by jasobrown for CASSANDRA-13028
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/07f990bc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/07f990bc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/07f990bc
Branch: refs/heads/cassandra-3.X
Commit: 07f990bc2d786fb2693369eed1a77c37fa0fd953
Parents: c0e7110
Author: Ariel Weisberg <aw...@apple.com>
Authored: Fri Dec 9 17:14:35 2016 -0500
Committer: Jason Brown <ja...@gmail.com>
Committed: Mon Dec 12 10:30:00 2016 -0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 8 +++++++-
2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07f990bc/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index c4f4c1f..ed0fc14 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.12
+ * Log message size in trace message in OutboundTcpConnection (CASSANDRA-13028)
* Add timeUnit Days for cassandra-stress (CASSANDRA-13029)
* Add mutation size and batch metrics (CASSANDRA-12649)
* Add method to get size of endpoints to TokenMetadata (CASSANDRA-12999)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07f990bc/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
index 1f47334..683aed2 100644
--- a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
@@ -82,6 +82,9 @@ public class OutboundTcpConnection extends FastThreadLocalThread
private static final String BUFFER_SIZE_PROPERTY = PREFIX + "otc_buffer_size";
private static final int BUFFER_SIZE = Integer.getInteger(BUFFER_SIZE_PROPERTY, 1024 * 64);
+ //Size of 3 elements added to every message
+ private static final int PROTOCOL_MAGIC_ID_TIMESTAMP_SIZE = 12;
+
private static CoalescingStrategy newCoalescingStrategy(String displayName)
{
return CoalescingStrategies.newCoalescingStrategy(DatabaseDescriptor.getOtcCoalescingStrategy(),
@@ -280,7 +283,9 @@ public class OutboundTcpConnection extends FastThreadLocalThread
{
UUID sessionId = UUIDGen.getUUID(ByteBuffer.wrap(sessionBytes));
TraceState state = Tracing.instance.get(sessionId);
- String message = String.format("Sending %s message to %s", qm.message.verb, poolReference.endPoint());
+ String message = String.format("Sending %s message to %s message size %d bytes", qm.message.verb,
+ poolReference.endPoint(),
+ qm.message.serializedSize(targetVersion) + PROTOCOL_MAGIC_ID_TIMESTAMP_SIZE);
// session may have already finished; see CASSANDRA-5668
if (state == null)
{
@@ -335,6 +340,7 @@ public class OutboundTcpConnection extends FastThreadLocalThread
private void writeInternal(MessageOut message, int id, long timestamp) throws IOException
{
+ //If you add/remove fields before the message don't forget to update PROTOCOL_MAGIC_ID_TIMESTAMP_SIZE
out.writeInt(MessagingService.PROTOCOL_MAGIC);
if (targetVersion < MessagingService.VERSION_20)
[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk
Posted by ja...@apache.org.
Merge branch 'cassandra-3.X' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5364310b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5364310b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5364310b
Branch: refs/heads/trunk
Commit: 5364310bf819971bc4605f92d4787636d7f839da
Parents: 9c0fa05 07f990b
Author: Jason Brown <ja...@gmail.com>
Authored: Mon Dec 12 10:30:50 2016 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Mon Dec 12 10:31:48 2016 -0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 8 +++++++-
2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5364310b/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 6e57ea7,ed0fc14..5d93b8a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,5 +1,14 @@@
+4.0
+ * Remove pre-3.0 compatibility code for 4.0 (CASSANDRA-12716)
+ * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
+ * Add (automate) Nodetool Documentation (CASSANDRA-12672)
+ * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
+ * Reject invalid replication settings when creating or altering a keyspace (CASSANDRA-12681)
+ * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter (CASSANDRA-12422)
+
+
3.12
+ * Log message size in trace message in OutboundTcpConnection (CASSANDRA-13028)
* Add timeUnit Days for cassandra-stress (CASSANDRA-13029)
* Add mutation size and batch metrics (CASSANDRA-12649)
* Add method to get size of endpoints to TokenMetadata (CASSANDRA-12999)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5364310b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/net/OutboundTcpConnection.java
index c32154e,683aed2..ceb0fa0
--- a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
@@@ -335,8 -340,13 +340,9 @@@ public class OutboundTcpConnection exte
private void writeInternal(MessageOut message, int id, long timestamp) throws IOException
{
+ //If you add/remove fields before the message don't forget to update PROTOCOL_MAGIC_ID_TIMESTAMP_SIZE
out.writeInt(MessagingService.PROTOCOL_MAGIC);
-
- if (targetVersion < MessagingService.VERSION_20)
- out.writeUTF(String.valueOf(id));
- else
- out.writeInt(id);
+ out.writeInt(id);
// int cast cuts off the high-order half of the timestamp, which we can assume remains
// the same between now and when the recipient reconstructs it.
[2/3] cassandra git commit: Log message size in trace message in
OutboundTcpConnection
Posted by ja...@apache.org.
Log message size in trace message in OutboundTcpConnection
patch by aweisberg; reviewed by jasobrown for CASSANDRA-13028
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/07f990bc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/07f990bc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/07f990bc
Branch: refs/heads/trunk
Commit: 07f990bc2d786fb2693369eed1a77c37fa0fd953
Parents: c0e7110
Author: Ariel Weisberg <aw...@apple.com>
Authored: Fri Dec 9 17:14:35 2016 -0500
Committer: Jason Brown <ja...@gmail.com>
Committed: Mon Dec 12 10:30:00 2016 -0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 8 +++++++-
2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07f990bc/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index c4f4c1f..ed0fc14 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.12
+ * Log message size in trace message in OutboundTcpConnection (CASSANDRA-13028)
* Add timeUnit Days for cassandra-stress (CASSANDRA-13029)
* Add mutation size and batch metrics (CASSANDRA-12649)
* Add method to get size of endpoints to TokenMetadata (CASSANDRA-12999)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07f990bc/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
index 1f47334..683aed2 100644
--- a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
@@ -82,6 +82,9 @@ public class OutboundTcpConnection extends FastThreadLocalThread
private static final String BUFFER_SIZE_PROPERTY = PREFIX + "otc_buffer_size";
private static final int BUFFER_SIZE = Integer.getInteger(BUFFER_SIZE_PROPERTY, 1024 * 64);
+ //Size of 3 elements added to every message
+ private static final int PROTOCOL_MAGIC_ID_TIMESTAMP_SIZE = 12;
+
private static CoalescingStrategy newCoalescingStrategy(String displayName)
{
return CoalescingStrategies.newCoalescingStrategy(DatabaseDescriptor.getOtcCoalescingStrategy(),
@@ -280,7 +283,9 @@ public class OutboundTcpConnection extends FastThreadLocalThread
{
UUID sessionId = UUIDGen.getUUID(ByteBuffer.wrap(sessionBytes));
TraceState state = Tracing.instance.get(sessionId);
- String message = String.format("Sending %s message to %s", qm.message.verb, poolReference.endPoint());
+ String message = String.format("Sending %s message to %s message size %d bytes", qm.message.verb,
+ poolReference.endPoint(),
+ qm.message.serializedSize(targetVersion) + PROTOCOL_MAGIC_ID_TIMESTAMP_SIZE);
// session may have already finished; see CASSANDRA-5668
if (state == null)
{
@@ -335,6 +340,7 @@ public class OutboundTcpConnection extends FastThreadLocalThread
private void writeInternal(MessageOut message, int id, long timestamp) throws IOException
{
+ //If you add/remove fields before the message don't forget to update PROTOCOL_MAGIC_ID_TIMESTAMP_SIZE
out.writeInt(MessagingService.PROTOCOL_MAGIC);
if (targetVersion < MessagingService.VERSION_20)