mirror of https://github.com/apache/cassandra
cqlsh: handle 'null' as session duration
patch by Mikhail Stepura; reviewed by Aleksey Yeschenko for CASSANDRA-6317
This commit is contained in:
parent
eb577459df
commit
310276555e
|
|
@ -13,6 +13,7 @@
|
|||
* Remove blocking flushes in gossip thread (CASSANDRA-6297)
|
||||
* Fix potential socket leak in connectionpool creation (CASSANDRA-6308)
|
||||
* Allow LOCAL_ONE/LOCAL_QUORUM to work with SimpleSrrategy (CASSANDRA-6238)
|
||||
* cqlsh: handle 'null' as session duration (CASSANDRA-6317)
|
||||
|
||||
|
||||
1.2.11
|
||||
|
|
|
|||
|
|
@ -43,7 +43,6 @@ def fetch_trace_session(cursor, session_id):
|
|||
"WHERE session_id = %s" % (TRACING_KS, SESSIONS_CF, session_id),
|
||||
consistency_level='ONE')
|
||||
(request, coordinator, started_at, duration) = cursor.fetchone()
|
||||
|
||||
cursor.execute("SELECT activity, event_id, source, source_elapsed "
|
||||
"FROM %s.%s "
|
||||
"WHERE session_id = %s" % (TRACING_KS, EVENTS_CF, session_id),
|
||||
|
|
@ -57,8 +56,12 @@ def fetch_trace_session(cursor, session_id):
|
|||
for activity, event_id, source, source_elapsed in events:
|
||||
rows.append([activity, format_timeuuid(event_id), source, source_elapsed])
|
||||
# append footer row (from sessions table).
|
||||
finished_at = started_at + (duration / 1000000.)
|
||||
rows.append(['Request complete', format_timestamp(finished_at), coordinator, duration])
|
||||
if duration:
|
||||
finished_at = format_timestamp(started_at + (duration / 1000000.))
|
||||
else:
|
||||
finished_at = duration = "--"
|
||||
|
||||
rows.append(['Request complete', finished_at, coordinator, duration])
|
||||
|
||||
return rows
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue