Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 9BCD1200B32 for ; Thu, 23 Jun 2016 17:36:36 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 9A962160A59; Thu, 23 Jun 2016 15:36:36 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id DAFFB160A35 for ; Thu, 23 Jun 2016 17:36:35 +0200 (CEST) Received: (qmail 13824 invoked by uid 500); 23 Jun 2016 15:36:34 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 13812 invoked by uid 99); 23 Jun 2016 15:36:34 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Jun 2016 15:36:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C66D0E38B1; Thu, 23 Jun 2016 15:36:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tylerhobbs@apache.org To: commits@cassandra.apache.org Date: Thu, 23 Jun 2016 15:36:34 -0000 Message-Id: <1c256df9cc2a4094b9de4f0bb0d87d04@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] cassandra git commit: cqlsh: Handle report_error() calls without a chunk arg archived-at: Thu, 23 Jun 2016 15:36:36 -0000 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 Authored: Thu Jun 23 10:35:00 2016 -0500 Committer: Tyler Hobbs 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))