From 626ac94cd53323cf84f92ab0d1f3e2a8c765f22b Mon Sep 17 00:00:00 2001 From: Carl Yeksigian Date: Fri, 24 Apr 2015 11:00:23 -0400 Subject: [PATCH] (cqlsh) show partial trace if incomplete after max_trace_wait patch by Carl Yeksigian; reviewed by Paulo Motta for CASSANDRA-7645 --- CHANGES.txt | 5 +++++ bin/cqlsh | 3 +++ 2 files changed, 8 insertions(+) diff --git a/CHANGES.txt b/CHANGES.txt index ff70045130..cd2a77920e 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,9 +1,14 @@ +2.1.12 + * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645) + + 2.1.11 * Fix mmap file segment seeking to EOF (CASSANDRA-10478) * Allow LOCAL_JMX to be easily overridden (CASSANDRA-10275) * Mark nodes as dead even if they've already left (CASSANDRA-10205) * Update internal python driver used by cqlsh (CASSANDRA-10161, CASSANDRA-10507) + 2.1.10 * Bulk Loader API could not tolerate even node failure (CASSANDRA-10347) * Avoid misleading pushed notifications when multiple nodes diff --git a/bin/cqlsh b/bin/cqlsh index 4a0a41bc37..2376d43985 100755 --- a/bin/cqlsh +++ b/bin/cqlsh @@ -1069,6 +1069,9 @@ class Shell(cmd.Cmd): if self.tracing_enabled: if stmt.trace: print_trace(self, stmt.trace) + elif stmt.trace_id: + self.writeresult("This statement trace may be incomplete", color=RED) + self.show_session(stmt.trace_id) else: msg = "Statement trace did not complete within %d seconds" % (self.session.max_trace_wait) self.writeresult(msg, color=RED)