[cassandra-dtest] branch master updated: Set seed port to 7001 during upgrade to > 3.11

[br...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git


The following commit(s) were added to refs/heads/master by this push:
     new ed55a49  Set seed port to 7001 during upgrade to > 3.11
ed55a49 is described below

commit ed55a4961f424f8456e125fdeb70ca644e8572c9
Author: Brandon Williams <br...@apache.org>
AuthorDate: Fri Mar 13 10:23:14 2020 -0500

    Set seed port to 7001 during upgrade to > 3.11
    
    Patch by brandonwilliams, reviewed by Ekaterina Dimitrova for CASSANDRA-15314
---
 upgrade_tests/upgrade_through_versions_test.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/upgrade_tests/upgrade_through_versions_test.py b/upgrade_tests/upgrade_through_versions_test.py
index 41bb7ec..ec84bec 100644
--- a/upgrade_tests/upgrade_through_versions_test.py
+++ b/upgrade_tests/upgrade_through_versions_test.py
@@ -342,6 +342,13 @@ class TestUpgrade(Tester):
 
             # upgrade through versions
             for version_meta in self.test_version_metas[1:]:
+                if version_meta.family > '3.11' and internode_ssl:
+                    seeds =[]
+                    for seed in cluster.seeds:
+                        seeds.append(seed.ip_addr + ':7001')
+                    logger.debug("Forcing seeds to 7001 for internode ssl")
+                    cluster.seeds = seeds
+
                 for num, node in enumerate(self.cluster.nodelist()):
                     # sleep (sigh) because driver needs extra time to keep up with topo and make quorum possible
                     # this is ok, because a real world upgrade would proceed much slower than this programmatic one
@@ -453,7 +460,7 @@ class TestUpgrade(Tester):
             logger.debug('Starting %s on new version (%s)' % (node.name, version_meta.version))
             # Setup log4j / logback again (necessary moving from 2.0 -> 2.1):
             node.set_log_level("INFO")
-            node.start(wait_other_notice=240, wait_for_binary_proto=True)
+            node.start(wait_other_notice=400, wait_for_binary_proto=True)
             node.nodetool('upgradesstables -a')
 
     def _log_current_ver(self, current_version_meta):


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org