You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pr@cassandra.apache.org by jasobrown <gi...@git.apache.org> on 2018/01/02 13:12:52 UTC
[GitHub] cassandra-dtest pull request #15: Cassandra 7544
GitHub user jasobrown opened a pull request:
https://github.com/apache/cassandra-dtest/pull/15
Cassandra 7544
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/aweisberg/cassandra-dtest cassandra-7544-2-which-is-right
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/cassandra-dtest/pull/15.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #15
----
commit 3a39ec37b14c6ece3ac8c6cfcd0e55cc9e1b02fb
Author: Ariel Weisberg <ar...@...>
Date: 2016-12-14T23:51:17Z
CASSANDRA-7544, fixes
CASSANDRA-7544, more fixes
Various upgrade version stupidity
Modify requirements to use custom ccm
Remove debug
Still don't know why this is necessary now.
All else equals I should have used greater than or equals.
Remove second port
Fix broken byteman scripts
Fix log check in rebuild_test.py
Repair participants with ports needs to be separate.
commit 824c32ac5a97335c8d618173d015d8e01658251e
Author: Ariel Weisberg <aw...@...>
Date: 2017-11-30T19:32:17Z
Fix incorrect IP in failure injection script.
commit 163ca4f59c25ce458c5636bd419a44232d48c403
Author: Ariel Weisberg <aw...@...>
Date: 2017-11-30T21:01:09Z
Update test to insert new columns.
commit 7fc2044865cbf6af486e2eccc93d35e97cb3d842
Author: Ariel Weisberg <aw...@...>
Date: 2017-12-01T21:19:31Z
Fix snitch test.
----
---
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For additional commands, e-mail: pr-help@cassandra.apache.org
[GitHub] cassandra-dtest pull request #15: Cassandra 7544
Posted by jasobrown <gi...@git.apache.org>.
Github user jasobrown commented on a diff in the pull request:
https://github.com/apache/cassandra-dtest/pull/15#discussion_r159234036
--- Diff: byteman/4.0/decommission_failure_inject.btm ---
@@ -10,8 +10,8 @@ METHOD prepareSynAck
AT INVOKE startStreamingFiles
BIND peer = $0.peer
# set flag to only run this rule once.
-IF peer.equals(InetAddress.getByName("127.0.0.1")) AND NOT flagged("done")
+IF peer.equals(org.apache.cassandra.locator.InetAddressAndPort.getByName("127.0.0.1")) AND NOT flagged("done")
--- End diff --
trivial nit: is the fully qualified class name necessary? or can you get away with just the class name?
---
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For additional commands, e-mail: pr-help@cassandra.apache.org
[GitHub] cassandra-dtest pull request #15: Cassandra 7544
Posted by jasobrown <gi...@git.apache.org>.
Github user jasobrown commented on a diff in the pull request:
https://github.com/apache/cassandra-dtest/pull/15#discussion_r159247693
--- Diff: snitch_test.py ---
@@ -35,15 +36,29 @@ def test_prefer_local_reconnect_on_listen_address(self):
NODE1_LISTEN_ADDRESS = '127.0.0.1'
NODE1_BROADCAST_ADDRESS = '127.0.0.3'
+ NODE1_LISTEN_FMT_ADDRESS = '/127.0.0.1'
+ NODE1_BROADCAST_FMT_ADDRESS = '/127.0.0.3'
+
+ NODE1_40_LISTEN_ADDRESS = '127.0.0.1:7000'
--- End diff --
are the hard coded ports ok here?
---
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For additional commands, e-mail: pr-help@cassandra.apache.org
[GitHub] cassandra-dtest pull request #15: Cassandra 7544
Posted by aweisberg <gi...@git.apache.org>.
Github user aweisberg commented on a diff in the pull request:
https://github.com/apache/cassandra-dtest/pull/15#discussion_r163307891
--- Diff: replace_address_test.py ---
@@ -35,7 +35,7 @@ class BaseReplaceAddressTest(Tester):
def _setup(self, n=3, opts=None, enable_byteman=False, mixed_versions=False):
debug("Starting cluster with {} nodes.".format(n))
- self.cluster.populate(n)
+ self.cluster.populate(n, use_vnodes=not DISABLE_VNODES)
--- End diff --
I think I was fixing some other annoying bug. Should have added a comment. I'll test without it and report back.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For additional commands, e-mail: pr-help@cassandra.apache.org
[GitHub] cassandra-dtest pull request #15: Cassandra 7544
Posted by jasobrown <gi...@git.apache.org>.
Github user jasobrown commented on a diff in the pull request:
https://github.com/apache/cassandra-dtest/pull/15#discussion_r159245209
--- Diff: rebuild_test.py ---
@@ -140,7 +140,9 @@ def resumable_rebuild_test(self):
"""
self.ignore_log_patterns = list(self.ignore_log_patterns) + [r'Error while rebuilding node',
r'Streaming error occurred on session with peer 127.0.0.3',
- r'Remote peer 127.0.0.3 failed stream session']
+ r'Remote peer 127.0.0.3 failed stream session',
+ r'Streaming error occurred on session with peer 127.0.0.3:7000',
--- End diff --
how will this work if we use a single (network) interface? or configurable ports? is it best to get the address of node3 and plug that into the patterns, or is that opening up a large can of worms?
---
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For additional commands, e-mail: pr-help@cassandra.apache.org
[GitHub] cassandra-dtest pull request #15: Cassandra 7544
Posted by jasobrown <gi...@git.apache.org>.
Github user jasobrown commented on a diff in the pull request:
https://github.com/apache/cassandra-dtest/pull/15#discussion_r159246279
--- Diff: requirements.txt ---
@@ -4,7 +4,7 @@
futures
six
-e git+https://github.com/datastax/python-driver.git@cassandra-test#egg=cassandra-driver
-ccm==3.1.0
+-e git+https://github.com/aweisberg/ccm.git@master#egg=ccm
--- End diff --
probably don't want to commit this when we're ready :)
---
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For additional commands, e-mail: pr-help@cassandra.apache.org
[GitHub] cassandra-dtest pull request #15: Cassandra 7544
Posted by jasobrown <gi...@git.apache.org>.
Github user jasobrown commented on a diff in the pull request:
https://github.com/apache/cassandra-dtest/pull/15#discussion_r159247123
--- Diff: replace_address_test.py ---
@@ -35,7 +35,7 @@ class BaseReplaceAddressTest(Tester):
def _setup(self, n=3, opts=None, enable_byteman=False, mixed_versions=False):
debug("Starting cluster with {} nodes.".format(n))
- self.cluster.populate(n)
+ self.cluster.populate(n, use_vnodes=not DISABLE_VNODES)
--- End diff --
Is this change necessary? It's not clear to me that vnodes would have an effect on configurable ports
---
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For additional commands, e-mail: pr-help@cassandra.apache.org
[GitHub] cassandra-dtest pull request #15: Cassandra 7544
Posted by jasobrown <gi...@git.apache.org>.
Github user jasobrown commented on a diff in the pull request:
https://github.com/apache/cassandra-dtest/pull/15#discussion_r159247279
--- Diff: secondary_indexes_test.py ---
@@ -1153,6 +1153,7 @@ def __init__(self, *args, **kwargs):
r'Streaming error occurred',
r'\[Stream.*\] Streaming error occurred',
r'\[Stream.*\] Remote peer 127.0.0.\d failed stream session',
+ r'\[Stream.*\] Remote peer 127.0.0.\d:7000 failed stream session',
--- End diff --
is the hardcoded port OK here?
---
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For additional commands, e-mail: pr-help@cassandra.apache.org
[GitHub] cassandra-dtest pull request #15: Cassandra 7544
Posted by jasobrown <gi...@git.apache.org>.
Github user jasobrown commented on a diff in the pull request:
https://github.com/apache/cassandra-dtest/pull/15#discussion_r159248098
--- Diff: topology_test.py ---
@@ -197,7 +197,7 @@ def resumable_decommission_test(self):
Test decommission operation is resumable
"""
- self.ignore_log_patterns = [r'Streaming error occurred', r'Error while decommissioning node', r'Remote peer 127.0.0.2 failed stream session']
+ self.ignore_log_patterns = [r'Streaming error occurred', r'Error while decommissioning node', r'Remote peer 127.0.0.2 failed stream session', r'Remote peer 127.0.0.2:7000 failed stream session']
--- End diff --
hard coded port?
---
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For additional commands, e-mail: pr-help@cassandra.apache.org
[GitHub] cassandra-dtest pull request #15: Cassandra 7544
Posted by jasobrown <gi...@git.apache.org>.
Github user jasobrown commented on a diff in the pull request:
https://github.com/apache/cassandra-dtest/pull/15#discussion_r159245703
--- Diff: repair_tests/incremental_repair_test.py ---
@@ -168,9 +171,10 @@ def _make_fake_session(self, keyspace, table):
for node in self.cluster.nodelist():
session = self.patient_exclusive_cql_connection(node)
session.execute("INSERT INTO system.repairs "
- "(parent_id, cfids, coordinator, last_update, participants, ranges, repaired_at, started_at, state) "
- "VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s)",
- [session_id, {cfid}, node1.address(), now, {n.address() for n in self.cluster.nodelist()},
+ "(parent_id, cfids, coordinator, coordinator_port, last_update, participants, participants_wp, ranges, repaired_at, started_at, state) "
+ "VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)",
+ [session_id, {cfid}, node1.address(), 7000, now, {n.address() for n in self.cluster.nodelist()},
+ {str(n.address()) + ":7000" for n in self.cluster.nodelist()},
--- End diff --
is hardcoding a port of `7000` ok here?
---
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For additional commands, e-mail: pr-help@cassandra.apache.org