Repository: cassandra-dtest Updated Branches: refs/heads/master 49b2dda4e -> 39e223fe8
Catch and ignore ToolError in test_dead_coordinator in repair_tests.py Patch by marcuse; reviewed by Sam Tunnicliffe for CASSANDRA-14158 Closes #16 Project: http://git-wip-us.apache.org/repos/asf/cassandra-dtest/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra-dtest/commit/39e223fe Tree: http://git-wip-us.apache.org/repos/asf/cassandra-dtest/tree/39e223fe Diff: http://git-wip-us.apache.org/repos/asf/cassandra-dtest/diff/39e223fe Branch: refs/heads/master Commit: 39e223fe82709e7557f7b2a86763c3ba011bbeac Parents: 49b2dda Author: Marcus Eriksson <[email protected]> Authored: Mon Jan 15 10:45:24 2018 +0100 Committer: Marcus Eriksson <[email protected]> Committed: Tue Jan 30 08:58:57 2018 +0100 ---------------------------------------------------------------------- repair_tests/repair_test.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra-dtest/blob/39e223fe/repair_tests/repair_test.py ---------------------------------------------------------------------- diff --git a/repair_tests/repair_test.py b/repair_tests/repair_test.py index 59910e0..53ab2af 100644 --- a/repair_tests/repair_test.py +++ b/repair_tests/repair_test.py @@ -1090,13 +1090,19 @@ class TestRepair(BaseRepairTest): cluster.populate(3).start(wait_for_binary_proto=True) node1, node2, node3 = cluster.nodelist() node1.stress(['write', 'n=100k', '-schema', 'replication(factor=3)', '-rate', 'threads=30']) - if cluster.version() >= "2.2": - t1 = threading.Thread(target=node1.repair) - t1.start() + def run_repair(): + try: + if cluster.version() >= "2.2": + node1.repair() + else: + node1.nodetool('repair keyspace1 standard1 -inc -par') + except ToolError: + debug("got expected exception during repair, ignoring") + t1 = threading.Thread(target=run_repair) + t1.start() + if cluster.version() > "2.2": node2.watch_log_for('Validating ValidationRequest', filename='debug.log') else: - t1 = threading.Thread(target=node1.nodetool, args=('repair keyspace1 standard1 -inc -par',)) - t1.start() node1.watch_log_for('requesting merkle trees', filename='system.log') time.sleep(2) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
