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

Merge branch 'cassandra-2.2' into cassandra-3.0

This commit is contained in:
Aleksey Yeschenko 2015-10-14 15:22:49 +01:00
parent 26c8892859 751e4f9e0d
commit 6d0c96c4d6
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -14,6 +14,7 @@ Merged from 2.2:
* cqlsh pg-style-strings broken (CASSANDRA-10484)
* cqlsh prompt includes name of keyspace after failed `use` statement (CASSANDRA-10369)
Merged from 2.1:
* (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645)
* Allow LOCAL_JMX to be easily overridden (CASSANDRA-10275)
* Mark nodes as dead even if they've already left (CASSANDRA-10205)

3
bin/cqlsh.py
View File

@ -1167,6 +1167,9 @@ class Shell(cmd.Cmd):
trace = future.get_query_trace(self.max_trace_wait)
if trace:
print_trace(self, 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)