Repository: cassandra Updated Branches: refs/heads/cassandra-2.2 8405f7366 -> 5807eca8b refs/heads/cassandra-3.0 6b36d9f05 -> 17a7a806c refs/heads/cassandra-3.11 d8a3aa46a -> 92e304277 refs/heads/trunk 3d2f06547 -> 106691b2f
cqlsh COPY FROM: increment error count only for failures, not for attempts patch by Kurt Greaves; reviewed by Stefania Alborghetti for CASSANDRA-13209 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5807eca8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5807eca8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5807eca8 Branch: refs/heads/cassandra-2.2 Commit: 5807eca8bbb30091b632e031441939c763b3e054 Parents: 8405f73 Author: Kurt <k...@instaclustr.com> Authored: Fri Jun 2 09:26:16 2017 +0800 Committer: Stefania Alborghetti <stefania.alborghe...@datastax.com> Committed: Tue Jun 6 08:49:17 2017 +0800 ---------------------------------------------------------------------- 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/5807eca8/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index ef2e12c..d00ddcb 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.2.10 + * cqlsh COPY FROM: increment error count only for failures, not for attempts (CASSANDRA-13209) * nodetool upgradesstables should upgrade system tables (CASSANDRA-13119) * Avoid starting gossiper in RemoveTest (CASSANDRA-13407) * Fix weightedSize() for row-cache reported by JMX and NodeTool (CASSANDRA-13393) http://git-wip-us.apache.org/repos/asf/cassandra/blob/5807eca8/pylib/cqlshlib/copyutil.py ---------------------------------------------------------------------- diff --git a/pylib/cqlshlib/copyutil.py b/pylib/cqlshlib/copyutil.py index 83e1742..b72b517 100644 --- a/pylib/cqlshlib/copyutil.py +++ b/pylib/cqlshlib/copyutil.py @@ -1068,11 +1068,11 @@ class ImportErrorHandler(object): shell.printerr("Failed to import %d rows: %s - %s, given up without retries" % (len(err.rows), err.name, err.msg)) else: - self.insert_errors += len(err.rows) if not err.final: shell.printerr("Failed to import %d rows: %s - %s, will retry later, attempt %d of %d" % (len(err.rows), err.name, err.msg, err.attempts, self.max_attempts)) else: + self.insert_errors += len(err.rows) self.add_failed_rows(err.rows) shell.printerr("Failed to import %d rows: %s - %s, given up after %d attempts" % (len(err.rows), err.name, err.msg, err.attempts)) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
