Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: pylib/cqlshlib/tracing.py
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5522a18a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5522a18a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5522a18a Branch: refs/heads/trunk Commit: 5522a18a72ac9de3c77a7a96e3412a00bb6d1d74 Parents: d52e7e6 3102765 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Sat Nov 9 03:07:03 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Sat Nov 9 03:07:03 2013 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + pylib/cqlshlib/tracing.py | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5522a18a/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 6ff2799,0532a45..6f28e88 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -32,42 -13,10 +32,43 @@@ Merged from 1.2 * 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 +2.0.2 + * Update FailureDetector to use nanontime (CASSANDRA-4925) + * Fix FileCacheService regressions (CASSANDRA-6149) + * Never return WriteTimeout for CL.ANY (CASSANDRA-6032) + * Fix race conditions in bulk loader (CASSANDRA-6129) + * Add configurable metrics reporting (CASSANDRA-4430) + * drop queries exceeding a configurable number of tombstones (CASSANDRA-6117) + * Track and persist sstable read activity (CASSANDRA-5515) + * Fixes for speculative retry (CASSANDRA-5932, CASSANDRA-6194) + * Improve memory usage of metadata min/max column names (CASSANDRA-6077) + * Fix thrift validation refusing row markers on CQL3 tables (CASSANDRA-6081) + * Fix insertion of collections with CAS (CASSANDRA-6069) + * Correctly send metadata on SELECT COUNT (CASSANDRA-6080) + * Track clients' remote addresses in ClientState (CASSANDRA-6070) + * Create snapshot dir if it does not exist when migrating + leveled manifest (CASSANDRA-6093) + * make sequential nodetool repair the default (CASSANDRA-5950) + * Add more hooks for compaction strategy implementations (CASSANDRA-6111) + * Fix potential NPE on composite 2ndary indexes (CASSANDRA-6098) + * Delete can potentially be skipped in batch (CASSANDRA-6115) + * Allow alter keyspace on system_traces (CASSANDRA-6016) + * Disallow empty column names in cql (CASSANDRA-6136) + * Use Java7 file-handling APIs and fix file moving on Windows (CASSANDRA-5383) + * Save compaction history to system keyspace (CASSANDRA-5078) + * Fix NPE if StorageService.getOperationMode() is executed before full startup (CASSANDRA-6166) + * CQL3: support pre-epoch longs for TimestampType (CASSANDRA-6212) + * Add reloadtriggers command to nodetool (CASSANDRA-4949) + * cqlsh: ignore empty 'value alias' in DESCRIBE (CASSANDRA-6139) + * Fix sstable loader (CASSANDRA-6205) + * Reject bootstrapping if the node already exists in gossip (CASSANDRA-5571) + * Fix NPE while loading paxos state (CASSANDRA-6211) + * cqlsh: add SHOW SESSION <tracing-session> command (CASSANDRA-6228) +Merged from 1.2: + * (Hadoop) Require CFRR batchSize to be at least 2 (CASSANDRA-6114) * Add a warning for small LCS sstable size (CASSANDRA-6191) * Add ability to list specific KS/CF combinations in nodetool cfstats (CASSANDRA-4191) * Mark CF clean if a mutation raced the drop and got it marked dirty (CASSANDRA-5946) http://git-wip-us.apache.org/repos/asf/cassandra/blob/5522a18a/pylib/cqlshlib/tracing.py ---------------------------------------------------------------------- diff --cc pylib/cqlshlib/tracing.py index 02d3296,3dc0ba7..fe0f71e --- a/pylib/cqlshlib/tracing.py +++ b/pylib/cqlshlib/tracing.py @@@ -45,11 -42,7 +45,10 @@@ def fetch_trace_session(cursor, session "FROM %s.%s " "WHERE session_id = %s" % (TRACING_KS, SESSIONS_CF, session_id), consistency_level='ONE') - (request, coordinator, started_at, duration) = cursor.fetchone() + session = cursor.fetchone() + if not session: + return [] + (request, coordinator, started_at, duration) = session - cursor.execute("SELECT activity, event_id, source, source_elapsed " "FROM %s.%s " "WHERE session_id = %s" % (TRACING_KS, EVENTS_CF, session_id),