You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/10/23 16:47:17 UTC
[1/3] git commit: fix tracing adding 2x activity instead of threadName
Updated Branches:
refs/heads/cassandra-2.0 941cd456a -> 854de4ed5
refs/heads/trunk 31a84ac02 -> 0951711ac
fix tracing adding 2x activity instead of threadName
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/854de4ed
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/854de4ed
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/854de4ed
Branch: refs/heads/cassandra-2.0
Commit: 854de4ed5681a5b7772d313bb5b44ade21ae4b72
Parents: 941cd45
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Oct 23 09:40:15 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Oct 23 09:46:49 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/tracing/TraceState.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/854de4ed/src/java/org/apache/cassandra/tracing/TraceState.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tracing/TraceState.java b/src/java/org/apache/cassandra/tracing/TraceState.java
index 410a726..b7d67a4 100644
--- a/src/java/org/apache/cassandra/tracing/TraceState.java
+++ b/src/java/org/apache/cassandra/tracing/TraceState.java
@@ -90,6 +90,7 @@ public class TraceState
public static void trace(final ByteBuffer sessionIdBytes, final String message, final int elapsed)
{
final ByteBuffer eventId = ByteBuffer.wrap(UUIDGen.getTimeUUIDBytes());
+ final String threadName = Thread.currentThread().getName();
StageManager.getStage(Stage.TRACING).execute(new WrappedRunnable()
{
@@ -101,7 +102,7 @@ public class TraceState
Tracing.addColumn(cf, Tracing.buildName(cfMeta, eventId, ByteBufferUtil.bytes("source")), FBUtilities.getBroadcastAddress());
if (elapsed >= 0)
Tracing.addColumn(cf, Tracing.buildName(cfMeta, eventId, ByteBufferUtil.bytes("source_elapsed")), elapsed);
- Tracing.addColumn(cf, Tracing.buildName(cfMeta, eventId, ByteBufferUtil.bytes("activity")), message);
+ Tracing.addColumn(cf, Tracing.buildName(cfMeta, eventId, ByteBufferUtil.bytes("thread")), threadName);
Tracing.mutateWithCatch(new RowMutation(Tracing.TRACE_KS, sessionIdBytes, cf));
}
});
[3/3] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by jb...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0951711a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0951711a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0951711a
Branch: refs/heads/trunk
Commit: 0951711ac1056f127b201fbca92ec0c7d51a3561
Parents: 31a84ac 854de4e
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Oct 23 09:47:10 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Oct 23 09:47:10 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/tracing/TraceState.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[2/3] git commit: fix tracing adding 2x activity instead of threadName
Posted by jb...@apache.org.
fix tracing adding 2x activity instead of threadName
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/854de4ed
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/854de4ed
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/854de4ed
Branch: refs/heads/trunk
Commit: 854de4ed5681a5b7772d313bb5b44ade21ae4b72
Parents: 941cd45
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Oct 23 09:40:15 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Oct 23 09:46:49 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/tracing/TraceState.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/854de4ed/src/java/org/apache/cassandra/tracing/TraceState.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tracing/TraceState.java b/src/java/org/apache/cassandra/tracing/TraceState.java
index 410a726..b7d67a4 100644
--- a/src/java/org/apache/cassandra/tracing/TraceState.java
+++ b/src/java/org/apache/cassandra/tracing/TraceState.java
@@ -90,6 +90,7 @@ public class TraceState
public static void trace(final ByteBuffer sessionIdBytes, final String message, final int elapsed)
{
final ByteBuffer eventId = ByteBuffer.wrap(UUIDGen.getTimeUUIDBytes());
+ final String threadName = Thread.currentThread().getName();
StageManager.getStage(Stage.TRACING).execute(new WrappedRunnable()
{
@@ -101,7 +102,7 @@ public class TraceState
Tracing.addColumn(cf, Tracing.buildName(cfMeta, eventId, ByteBufferUtil.bytes("source")), FBUtilities.getBroadcastAddress());
if (elapsed >= 0)
Tracing.addColumn(cf, Tracing.buildName(cfMeta, eventId, ByteBufferUtil.bytes("source_elapsed")), elapsed);
- Tracing.addColumn(cf, Tracing.buildName(cfMeta, eventId, ByteBufferUtil.bytes("activity")), message);
+ Tracing.addColumn(cf, Tracing.buildName(cfMeta, eventId, ByteBufferUtil.bytes("thread")), threadName);
Tracing.mutateWithCatch(new RowMutation(Tracing.TRACE_KS, sessionIdBytes, cf));
}
});