Updated Branches: refs/heads/trunk 929b26ecf -> 0507dbe1c
reapply fix for CASSANDRA-4599 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0507dbe1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0507dbe1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0507dbe1 Branch: refs/heads/trunk Commit: 0507dbe1cdedbb616b49ecd8240dbe4fa119f35d Parents: 929b26e Author: Yuki Morishita <yu...@apache.org> Authored: Tue Nov 6 17:42:52 2012 -0600 Committer: Yuki Morishita <yu...@apache.org> Committed: Tue Nov 6 17:42:52 2012 -0600 ---------------------------------------------------------------------- .../apache/cassandra/tracing/TracingAppender.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0507dbe1/src/java/org/apache/cassandra/tracing/TracingAppender.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tracing/TracingAppender.java b/src/java/org/apache/cassandra/tracing/TracingAppender.java index 4d4a9a0..ff8fc62 100644 --- a/src/java/org/apache/cassandra/tracing/TracingAppender.java +++ b/src/java/org/apache/cassandra/tracing/TracingAppender.java @@ -49,6 +49,7 @@ public class TracingAppender extends AppenderSkeleton return; final int elapsed = state.elapsed(); + final String threadName = event.getThreadName(); final ByteBuffer eventId = ByteBufferUtil.bytes(UUIDGen.makeType1UUIDFromHost(FBUtilities.getBroadcastAddress())); StageManager.getStage(Stage.TRACING).execute(new WrappedRunnable() { @@ -57,7 +58,7 @@ public class TracingAppender extends AppenderSkeleton CFMetaData cfMeta = CFMetaData.TraceEventsCf; ColumnFamily cf = ColumnFamily.create(cfMeta); addColumn(cf, buildName(cfMeta, eventId, bytes("source")), FBUtilities.getBroadcastAddress()); - addColumn(cf, buildName(cfMeta, eventId, bytes("thread")), event.getThreadName()); + addColumn(cf, buildName(cfMeta, eventId, bytes("thread")), threadName); addColumn(cf, buildName(cfMeta, eventId, bytes("source_elapsed")), elapsed); addColumn(cf, buildName(cfMeta, eventId, bytes("activity")), event.getMessage().toString()); RowMutation mutation = new RowMutation(Tracing.TRACE_KS, state.sessionIdBytes);