Repository: cassandra Updated Branches: refs/heads/trunk 5ca8052a9 -> 692d9992d
cqlsh: Suppress stacktraces for Read/WriteFailures Patch by Zhongxiang Zheng; reviewed by Tyler Hobbs for CASSANDRA-11032 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7a7704e5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7a7704e5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7a7704e5 Branch: refs/heads/trunk Commit: 7a7704e5fddb00c877329db93d352e03e2179703 Parents: 6f236c8 Author: Zhongxiang Zheng <[email protected]> Authored: Fri May 27 13:04:47 2016 -0500 Committer: Tyler Hobbs <[email protected]> Committed: Fri May 27 15:47:36 2016 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh.py | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7a7704e5/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 103eff0..d96f3c6 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 3.0.7 + * cqlsh: Suppress stack trace from Read/WriteFailures (CASSANDRA-11032) * Remove unneeded code to repair index summaries that have been improperly down-sampled (CASSANDRA-11127) * Avoid WriteTimeoutExceptions during commit log replay due to materialized http://git-wip-us.apache.org/repos/asf/cassandra/blob/7a7704e5/bin/cqlsh.py ---------------------------------------------------------------------- diff --git a/bin/cqlsh.py b/bin/cqlsh.py index 0c60a52..9dc7b77 100644 --- a/bin/cqlsh.py +++ b/bin/cqlsh.py @@ -152,7 +152,6 @@ from cassandra.metadata import (ColumnMetadata, KeyspaceMetadata, TableMetadata, protect_name, protect_names) from cassandra.policies import WhiteListRoundRobinPolicy from cassandra.query import SimpleStatement, ordered_dict_factory, TraceUnavailable -from cassandra.type_codes import DateType from cassandra.util import datetime_from_timestamp # cqlsh should run correctly when run out of a Cassandra source tree, @@ -263,8 +262,8 @@ if os.path.exists(OLD_HISTORY): # END history/config definition CQL_ERRORS = ( - cassandra.AlreadyExists, cassandra.AuthenticationFailed, cassandra.InvalidRequest, - cassandra.Timeout, cassandra.Unauthorized, cassandra.OperationTimedOut, + cassandra.AlreadyExists, cassandra.AuthenticationFailed, cassandra.CoordinationFailure, + cassandra.InvalidRequest, cassandra.Timeout, cassandra.Unauthorized, cassandra.OperationTimedOut, cassandra.cluster.NoHostAvailable, cassandra.connection.ConnectionBusy, cassandra.connection.ProtocolError, cassandra.connection.ConnectionException, cassandra.protocol.ErrorMessage, cassandra.protocol.InternalError, cassandra.query.TraceUnavailable
