[1/3] cassandra git commit: Improve trace messages for RR
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 2a4ab8716 - 14d7a63b8
Improve trace messages for RR
patch by Robert Stupp; reviewed by Jason Brown for CASSANDRA-9479
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/353d4a05
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/353d4a05
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/353d4a05
Branch: refs/heads/cassandra-2.2
Commit: 353d4a052c866cb230e06e69e99d9c5c8c8d955c
Parents: f2db756
Author: Robert Stupp sn...@snazy.de
Authored: Sun Jun 28 10:24:34 2015 +0200
Committer: Robert Stupp sn...@snazy.de
Committed: Sun Jun 28 10:24:34 2015 +0200
--
CHANGES.txt | 1 +
.../apache/cassandra/net/MessagingService.java | 2 +-
.../cassandra/net/OutboundTcpConnection.java | 2 +-
.../cassandra/service/AbstractReadExecutor.java | 17 +
.../apache/cassandra/service/ReadCallback.java | 19 ++-
.../cassandra/service/RowDataResolver.java | 2 ++
6 files changed, 40 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/353d4a05/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 32f0873..6a137a3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.17
+ * Improve trace messages for RR (CASSANDRA-9479)
* Fix suboptimal secondary index selection when restricted
clustering column is also indexed (CASSANDRA-9631)
* (cqlsh) Add min_threshold to DTCS option autocomplete (CASSANDRA-9385)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/353d4a05/src/java/org/apache/cassandra/net/MessagingService.java
--
diff --git a/src/java/org/apache/cassandra/net/MessagingService.java
b/src/java/org/apache/cassandra/net/MessagingService.java
index d570faf..ee6b87b 100644
--- a/src/java/org/apache/cassandra/net/MessagingService.java
+++ b/src/java/org/apache/cassandra/net/MessagingService.java
@@ -722,7 +722,7 @@ public final class MessagingService implements
MessagingServiceMBean
{
TraceState state = Tracing.instance.initializeFromMessage(message);
if (state != null)
-state.trace(Message received from {}, message.from);
+state.trace({} message received from {}, message.verb,
message.from);
Verb verb = message.verb;
message = SinkManager.processInboundMessage(message, id);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/353d4a05/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 5559df2..af61dd4 100644
--- a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
@@ -186,7 +186,7 @@ public class OutboundTcpConnection extends Thread
{
UUID sessionId =
UUIDGen.getUUID(ByteBuffer.wrap(sessionBytes));
TraceState state = Tracing.instance.get(sessionId);
-String message = String.format(Sending message to %s,
poolReference.endPoint());
+String message = String.format(Sending %s message to %s,
qm.message.verb, poolReference.endPoint());
// session may have already finished; see CASSANDRA-5668
if (state == null)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/353d4a05/src/java/org/apache/cassandra/service/AbstractReadExecutor.java
--
diff --git a/src/java/org/apache/cassandra/service/AbstractReadExecutor.java
b/src/java/org/apache/cassandra/service/AbstractReadExecutor.java
index 3f57e73..2f2370d 100644
--- a/src/java/org/apache/cassandra/service/AbstractReadExecutor.java
+++ b/src/java/org/apache/cassandra/service/AbstractReadExecutor.java
@@ -43,6 +43,8 @@ import org.apache.cassandra.metrics.ReadRepairMetrics;
import org.apache.cassandra.net.MessageOut;
import org.apache.cassandra.net.MessagingService;
import org.apache.cassandra.service.StorageProxy.LocalReadRunnable;
+import org.apache.cassandra.tracing.TraceState;
+import org.apache.cassandra.tracing.Tracing;
import org.apache.cassandra.utils.FBUtilities;
/**
@@ -61,12 +63,14 @@ public abstract class AbstractReadExecutor
protected final ListInetAddress targetReplicas;
protected final RowDigestResolver resolver;
protected final ReadCallbackReadResponse, Row handler;
+protected final TraceState traceState;
[1/2] cassandra git commit: Improve trace messages for RR
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 2c5858133 - 8a56868bc
Improve trace messages for RR
patch by Robert Stupp; reviewed by Jason Brown for CASSANDRA-9479
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/353d4a05
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/353d4a05
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/353d4a05
Branch: refs/heads/cassandra-2.1
Commit: 353d4a052c866cb230e06e69e99d9c5c8c8d955c
Parents: f2db756
Author: Robert Stupp sn...@snazy.de
Authored: Sun Jun 28 10:24:34 2015 +0200
Committer: Robert Stupp sn...@snazy.de
Committed: Sun Jun 28 10:24:34 2015 +0200
--
CHANGES.txt | 1 +
.../apache/cassandra/net/MessagingService.java | 2 +-
.../cassandra/net/OutboundTcpConnection.java | 2 +-
.../cassandra/service/AbstractReadExecutor.java | 17 +
.../apache/cassandra/service/ReadCallback.java | 19 ++-
.../cassandra/service/RowDataResolver.java | 2 ++
6 files changed, 40 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/353d4a05/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 32f0873..6a137a3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.17
+ * Improve trace messages for RR (CASSANDRA-9479)
* Fix suboptimal secondary index selection when restricted
clustering column is also indexed (CASSANDRA-9631)
* (cqlsh) Add min_threshold to DTCS option autocomplete (CASSANDRA-9385)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/353d4a05/src/java/org/apache/cassandra/net/MessagingService.java
--
diff --git a/src/java/org/apache/cassandra/net/MessagingService.java
b/src/java/org/apache/cassandra/net/MessagingService.java
index d570faf..ee6b87b 100644
--- a/src/java/org/apache/cassandra/net/MessagingService.java
+++ b/src/java/org/apache/cassandra/net/MessagingService.java
@@ -722,7 +722,7 @@ public final class MessagingService implements
MessagingServiceMBean
{
TraceState state = Tracing.instance.initializeFromMessage(message);
if (state != null)
-state.trace(Message received from {}, message.from);
+state.trace({} message received from {}, message.verb,
message.from);
Verb verb = message.verb;
message = SinkManager.processInboundMessage(message, id);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/353d4a05/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 5559df2..af61dd4 100644
--- a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
@@ -186,7 +186,7 @@ public class OutboundTcpConnection extends Thread
{
UUID sessionId =
UUIDGen.getUUID(ByteBuffer.wrap(sessionBytes));
TraceState state = Tracing.instance.get(sessionId);
-String message = String.format(Sending message to %s,
poolReference.endPoint());
+String message = String.format(Sending %s message to %s,
qm.message.verb, poolReference.endPoint());
// session may have already finished; see CASSANDRA-5668
if (state == null)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/353d4a05/src/java/org/apache/cassandra/service/AbstractReadExecutor.java
--
diff --git a/src/java/org/apache/cassandra/service/AbstractReadExecutor.java
b/src/java/org/apache/cassandra/service/AbstractReadExecutor.java
index 3f57e73..2f2370d 100644
--- a/src/java/org/apache/cassandra/service/AbstractReadExecutor.java
+++ b/src/java/org/apache/cassandra/service/AbstractReadExecutor.java
@@ -43,6 +43,8 @@ import org.apache.cassandra.metrics.ReadRepairMetrics;
import org.apache.cassandra.net.MessageOut;
import org.apache.cassandra.net.MessagingService;
import org.apache.cassandra.service.StorageProxy.LocalReadRunnable;
+import org.apache.cassandra.tracing.TraceState;
+import org.apache.cassandra.tracing.Tracing;
import org.apache.cassandra.utils.FBUtilities;
/**
@@ -61,12 +63,14 @@ public abstract class AbstractReadExecutor
protected final ListInetAddress targetReplicas;
protected final RowDigestResolver resolver;
protected final ReadCallbackReadResponse, Row handler;
+protected final TraceState traceState;
[1/4] cassandra git commit: Improve trace messages for RR
Repository: cassandra
Updated Branches:
refs/heads/trunk 9e2893853 - 6739434c6
Improve trace messages for RR
patch by Robert Stupp; reviewed by Jason Brown for CASSANDRA-9479
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/353d4a05
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/353d4a05
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/353d4a05
Branch: refs/heads/trunk
Commit: 353d4a052c866cb230e06e69e99d9c5c8c8d955c
Parents: f2db756
Author: Robert Stupp sn...@snazy.de
Authored: Sun Jun 28 10:24:34 2015 +0200
Committer: Robert Stupp sn...@snazy.de
Committed: Sun Jun 28 10:24:34 2015 +0200
--
CHANGES.txt | 1 +
.../apache/cassandra/net/MessagingService.java | 2 +-
.../cassandra/net/OutboundTcpConnection.java | 2 +-
.../cassandra/service/AbstractReadExecutor.java | 17 +
.../apache/cassandra/service/ReadCallback.java | 19 ++-
.../cassandra/service/RowDataResolver.java | 2 ++
6 files changed, 40 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/353d4a05/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 32f0873..6a137a3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.17
+ * Improve trace messages for RR (CASSANDRA-9479)
* Fix suboptimal secondary index selection when restricted
clustering column is also indexed (CASSANDRA-9631)
* (cqlsh) Add min_threshold to DTCS option autocomplete (CASSANDRA-9385)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/353d4a05/src/java/org/apache/cassandra/net/MessagingService.java
--
diff --git a/src/java/org/apache/cassandra/net/MessagingService.java
b/src/java/org/apache/cassandra/net/MessagingService.java
index d570faf..ee6b87b 100644
--- a/src/java/org/apache/cassandra/net/MessagingService.java
+++ b/src/java/org/apache/cassandra/net/MessagingService.java
@@ -722,7 +722,7 @@ public final class MessagingService implements
MessagingServiceMBean
{
TraceState state = Tracing.instance.initializeFromMessage(message);
if (state != null)
-state.trace(Message received from {}, message.from);
+state.trace({} message received from {}, message.verb,
message.from);
Verb verb = message.verb;
message = SinkManager.processInboundMessage(message, id);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/353d4a05/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 5559df2..af61dd4 100644
--- a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
@@ -186,7 +186,7 @@ public class OutboundTcpConnection extends Thread
{
UUID sessionId =
UUIDGen.getUUID(ByteBuffer.wrap(sessionBytes));
TraceState state = Tracing.instance.get(sessionId);
-String message = String.format(Sending message to %s,
poolReference.endPoint());
+String message = String.format(Sending %s message to %s,
qm.message.verb, poolReference.endPoint());
// session may have already finished; see CASSANDRA-5668
if (state == null)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/353d4a05/src/java/org/apache/cassandra/service/AbstractReadExecutor.java
--
diff --git a/src/java/org/apache/cassandra/service/AbstractReadExecutor.java
b/src/java/org/apache/cassandra/service/AbstractReadExecutor.java
index 3f57e73..2f2370d 100644
--- a/src/java/org/apache/cassandra/service/AbstractReadExecutor.java
+++ b/src/java/org/apache/cassandra/service/AbstractReadExecutor.java
@@ -43,6 +43,8 @@ import org.apache.cassandra.metrics.ReadRepairMetrics;
import org.apache.cassandra.net.MessageOut;
import org.apache.cassandra.net.MessagingService;
import org.apache.cassandra.service.StorageProxy.LocalReadRunnable;
+import org.apache.cassandra.tracing.TraceState;
+import org.apache.cassandra.tracing.Tracing;
import org.apache.cassandra.utils.FBUtilities;
/**
@@ -61,12 +63,14 @@ public abstract class AbstractReadExecutor
protected final ListInetAddress targetReplicas;
protected final RowDigestResolver resolver;
protected final ReadCallbackReadResponse, Row handler;
+protected final TraceState traceState;
cassandra git commit: Improve trace messages for RR
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 f2db756ab - 353d4a052
Improve trace messages for RR
patch by Robert Stupp; reviewed by Jason Brown for CASSANDRA-9479
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/353d4a05
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/353d4a05
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/353d4a05
Branch: refs/heads/cassandra-2.0
Commit: 353d4a052c866cb230e06e69e99d9c5c8c8d955c
Parents: f2db756
Author: Robert Stupp sn...@snazy.de
Authored: Sun Jun 28 10:24:34 2015 +0200
Committer: Robert Stupp sn...@snazy.de
Committed: Sun Jun 28 10:24:34 2015 +0200
--
CHANGES.txt | 1 +
.../apache/cassandra/net/MessagingService.java | 2 +-
.../cassandra/net/OutboundTcpConnection.java | 2 +-
.../cassandra/service/AbstractReadExecutor.java | 17 +
.../apache/cassandra/service/ReadCallback.java | 19 ++-
.../cassandra/service/RowDataResolver.java | 2 ++
6 files changed, 40 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/353d4a05/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 32f0873..6a137a3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.17
+ * Improve trace messages for RR (CASSANDRA-9479)
* Fix suboptimal secondary index selection when restricted
clustering column is also indexed (CASSANDRA-9631)
* (cqlsh) Add min_threshold to DTCS option autocomplete (CASSANDRA-9385)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/353d4a05/src/java/org/apache/cassandra/net/MessagingService.java
--
diff --git a/src/java/org/apache/cassandra/net/MessagingService.java
b/src/java/org/apache/cassandra/net/MessagingService.java
index d570faf..ee6b87b 100644
--- a/src/java/org/apache/cassandra/net/MessagingService.java
+++ b/src/java/org/apache/cassandra/net/MessagingService.java
@@ -722,7 +722,7 @@ public final class MessagingService implements
MessagingServiceMBean
{
TraceState state = Tracing.instance.initializeFromMessage(message);
if (state != null)
-state.trace(Message received from {}, message.from);
+state.trace({} message received from {}, message.verb,
message.from);
Verb verb = message.verb;
message = SinkManager.processInboundMessage(message, id);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/353d4a05/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 5559df2..af61dd4 100644
--- a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
@@ -186,7 +186,7 @@ public class OutboundTcpConnection extends Thread
{
UUID sessionId =
UUIDGen.getUUID(ByteBuffer.wrap(sessionBytes));
TraceState state = Tracing.instance.get(sessionId);
-String message = String.format(Sending message to %s,
poolReference.endPoint());
+String message = String.format(Sending %s message to %s,
qm.message.verb, poolReference.endPoint());
// session may have already finished; see CASSANDRA-5668
if (state == null)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/353d4a05/src/java/org/apache/cassandra/service/AbstractReadExecutor.java
--
diff --git a/src/java/org/apache/cassandra/service/AbstractReadExecutor.java
b/src/java/org/apache/cassandra/service/AbstractReadExecutor.java
index 3f57e73..2f2370d 100644
--- a/src/java/org/apache/cassandra/service/AbstractReadExecutor.java
+++ b/src/java/org/apache/cassandra/service/AbstractReadExecutor.java
@@ -43,6 +43,8 @@ import org.apache.cassandra.metrics.ReadRepairMetrics;
import org.apache.cassandra.net.MessageOut;
import org.apache.cassandra.net.MessagingService;
import org.apache.cassandra.service.StorageProxy.LocalReadRunnable;
+import org.apache.cassandra.tracing.TraceState;
+import org.apache.cassandra.tracing.Tracing;
import org.apache.cassandra.utils.FBUtilities;
/**
@@ -61,12 +63,14 @@ public abstract class AbstractReadExecutor
protected final ListInetAddress targetReplicas;
protected final RowDigestResolver resolver;
protected final ReadCallbackReadResponse, Row handler;
+protected final TraceState traceState;
