Repository: cassandra Updated Branches: refs/heads/trunk fc7785bfe -> ff8d078c5
cqlsh: Handle report_error() calls without a chunk arg Patch by Tyler Hobbs; reviewed by Stefania Alborghetti for CASSANDRA-12070 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/edaa6937 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/edaa6937 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/edaa6937 Branch: refs/heads/trunk Commit: edaa6937015595131c4dd06e0529a979d88dc577 Parents: ffd6bab Author: Tyler Hobbs <[email protected]> Authored: Thu Jun 23 10:35:00 2016 -0500 Committer: Tyler Hobbs <[email protected]> Committed: Thu Jun 23 10:35:00 2016 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + pylib/cqlshlib/copyutil.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/edaa6937/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 0e9935d..488fde3 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 3.0.8 + * cqlsh: fix error handling in rare COPY FROM failure scenario (CASSANDRA-12070) * Disable autocompaction during drain (CASSANDRA-11878) * Add a metrics timer to MemtablePool and use it to track time spent blocked on memory in MemtableAllocator (CASSANDRA-11327) * Fix upgrading schema with super columns with non-text subcomparators (CASSANDRA-12023) http://git-wip-us.apache.org/repos/asf/cassandra/blob/edaa6937/pylib/cqlshlib/copyutil.py ---------------------------------------------------------------------- diff --git a/pylib/cqlshlib/copyutil.py b/pylib/cqlshlib/copyutil.py index 700b062..ef009e2 100644 --- a/pylib/cqlshlib/copyutil.py +++ b/pylib/cqlshlib/copyutil.py @@ -2443,7 +2443,7 @@ class ImportProcess(ChildProcess): future.add_callbacks(callback=self.result_callback, callback_args=(batch, chunk), errback=self.err_callback, errback_args=(batch, chunk, replicas)) - def report_error(self, err, chunk, rows=None, attempts=1, final=True): + def report_error(self, err, chunk=None, rows=None, attempts=1, final=True): if self.debug and sys.exc_info()[1] == err: traceback.print_exc() self.outmsg.send(ImportTaskError(err.__class__.__name__, err.message, rows, attempts, final))
