natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix millisecond timestamps in Tracing 

patch by Aleksey Yeschenko; reviewed by Sam Tunnicliffe for
CASSANDRA-8297
This commit is contained in:
Aleksey Yeschenko 2014-11-12 23:44:00 +03:00
parent a6802aa479
commit be79142297
3 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -1,4 +1,5 @@
2.0.12:
* Fix millisecond timestamps in Tracing (CASSANDRA-8297)
* Include keyspace name in error message when there are insufficient
live nodes to stream from (CASSANDRA-8221)
* Avoid overlap in L1 when L0 contains many nonoverlapping

4
src/java/org/apache/cassandra/config/CFMetaData.java
View File

@ -217,7 +217,7 @@ public final class CFMetaData
+ "started_at timestamp,"
+ "parameters map<text, text>,"
+ "duration int"
+ ") WITH COMMENT='traced sessions'",
+ ") WITH COMMENT='traced sessions' AND default_time_to_live=86400",
Tracing.TRACE_KS);
public static final CFMetaData TraceEventsCf = compile("CREATE TABLE " + Tracing.EVENTS_CF + " ("
@ -228,7 +228,7 @@ public final class CFMetaData
+ "activity text,"
+ "source_elapsed int,"
+ "PRIMARY KEY (session_id, event_id)"
+ ")",
+ ") WITH default_time_to_live=86400",
Tracing.TRACE_KS);
public static final CFMetaData BatchlogCf = compile("CREATE TABLE " + SystemKeyspace.BATCHLOG_CF + " ("

21
src/java/org/apache/cassandra/tracing/Tracing.java
View File

@ -59,15 +59,13 @@ public class Tracing
public static final String SESSIONS_CF = "sessions";
public static final String TRACE_HEADER = "TraceSession";
private static final int TTL = 24 * 3600;
private static final Logger logger = LoggerFactory.getLogger(Tracing.class);
private final InetAddress localAddress = FBUtilities.getLocalAddress();
private final ThreadLocal<TraceState> state = new ThreadLocal<TraceState>();
private final ThreadLocal<TraceState> state = new ThreadLocal<>();
private final ConcurrentMap<UUID, TraceState> sessions = new ConcurrentHashMap<UUID, TraceState>();
private final ConcurrentMap<UUID, TraceState> sessions = new ConcurrentHashMap<>();
public static final Tracing instance = new Tracing();
@ -93,16 +91,7 @@ public class Tracing
private static void addColumn(ColumnFamily cf, ByteBuffer name, ByteBuffer value)
{
cf.addColumn(new ExpiringColumn(name, value, System.currentTimeMillis(), TTL));
}
public void addParameterColumns(ColumnFamily cf, Map<String, String> rawPayload)
{
for (Map.Entry<String, String> entry : rawPayload.entrySet())
{
cf.addColumn(new ExpiringColumn(buildName(cf.metadata(), bytes("parameters"), bytes(entry.getKey())),
bytes(entry.getValue()), System.currentTimeMillis(), TTL));
}
cf.addColumn(name, value, FBUtilities.timestampMicros());
}
public static ByteBuffer buildName(CFMetaData meta, ByteBuffer... args)
@ -208,10 +197,10 @@ public class Tracing
CFMetaData cfMeta = CFMetaData.TraceSessionsCf;
ColumnFamily cf = TreeMapBackedSortedColumns.factory.create(cfMeta);
addColumn(cf, buildName(cfMeta, bytes("coordinator")), FBUtilities.getBroadcastAddress());
addParameterColumns(cf, parameters);
for (Map.Entry<String, String> entry : parameters.entrySet())
addColumn(cf, buildName(cf.metadata(), bytes("parameters"), bytes(entry.getKey())), entry.getValue());
addColumn(cf, buildName(cfMeta, bytes("request")), request);
addColumn(cf, buildName(cfMeta, bytes("started_at")), started_at);
addParameterColumns(cf, parameters);
mutateWithCatch(new RowMutation(TRACE_KS, sessionIdBytes, cf));
}
});