You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by bd...@apache.org on 2018/09/26 23:46:04 UTC
cassandra-dtest git commit: skip TestRepair.test_dead_coordinator
dtest in 4.0
Repository: cassandra-dtest
Updated Branches:
refs/heads/master 96f90eee2 -> f4888c897
skip TestRepair.test_dead_coordinator dtest in 4.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra-dtest/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra-dtest/commit/f4888c89
Tree: http://git-wip-us.apache.org/repos/asf/cassandra-dtest/tree/f4888c89
Diff: http://git-wip-us.apache.org/repos/asf/cassandra-dtest/diff/f4888c89
Branch: refs/heads/master
Commit: f4888c8976c2012e9de3b92dedb0ae1a3c984a4b
Parents: 96f90ee
Author: Blake Eggleston <bd...@gmail.com>
Authored: Tue Sep 25 15:58:14 2018 -0700
Committer: Blake Eggleston <bd...@gmail.com>
Committed: Wed Sep 26 16:45:39 2018 -0700
----------------------------------------------------------------------
repair_tests/repair_test.py | 33 +--------------------------------
1 file changed, 1 insertion(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra-dtest/blob/f4888c89/repair_tests/repair_test.py
----------------------------------------------------------------------
diff --git a/repair_tests/repair_test.py b/repair_tests/repair_test.py
index d4a59a8..3264671 100644
--- a/repair_tests/repair_test.py
+++ b/repair_tests/repair_test.py
@@ -1087,35 +1087,7 @@ class TestRepair(BaseRepairTest):
node2.start(wait_for_binary_proto=True)
node2.repair()
- def _cancel_open_ir_sessions(self, nodes):
- cancelled = 0;
- for node in nodes:
- stdout = node.nodetool('repair_admin').stdout.strip()
- if stdout.strip() == 'no sessions':
- continue
-
- for line in stdout.split('\n')[1:]:
- columns = [c.strip() for c in line.split('|')]
- session = columns[0]
- coordinator = columns[3]
- if coordinator == node.address_and_port():
- node.nodetool('repair_admin --cancel {}'.format(session))
- cancelled += 1
-
- time.sleep(1)
-
- # force all of the sstables out of pending repair
- for node in nodes:
- node.nodetool('compact')
-
- for node in nodes:
- stdout = node.nodetool('repair_admin').stdout.strip()
- assert stdout.strip() == 'no sessions'
-
- return cancelled
-
-
-
+ @since('2.1', max_version='4')
def test_dead_coordinator(self):
"""
@jira_ticket CASSANDRA-11824
@@ -1151,9 +1123,6 @@ class TestRepair(BaseRepairTest):
node1.start(wait_for_binary_proto=True, wait_other_notice=True)
logger.debug("running second repair")
if cluster.version() >= "2.2":
- # 4.0+ actually requires manual intervention here (CASSANDRA-14763)
- if cluster.version() >= '4.0':
- assert self._cancel_open_ir_sessions(cluster.nodelist()) == 1
node1.repair()
else:
node1.nodetool('repair keyspace1 standard1 -inc -par')
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org