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

aleksey 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 64dca64  Ensure that tracing doesn't break connections in 3.x/4.0 
mixed mode by default
64dca64 is described below

commit 64dca6496874160709548e6dc9696417b837bda0
Author: Aleksey Yeschenko <alek...@apple.com>
AuthorDate: Thu Oct 31 13:06:30 2019 +0000

    Ensure that tracing doesn't break connections in 3.x/4.0 mixed mode by 
default
    
    patch by Aleksey Yeschenko; reviewed by Sam Tunnicliffe for CASSANDRA-15385
---
 upgrade_tests/cql_tests.py | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/upgrade_tests/cql_tests.py b/upgrade_tests/cql_tests.py
index a03cf9c..d3475a3 100644
--- a/upgrade_tests/cql_tests.py
+++ b/upgrade_tests/cql_tests.py
@@ -5465,7 +5465,7 @@ class TestCQL(UpgradeTester):
             logger.debug("Querying {} node".format("upgraded" if is_upgraded 
else "old"))
             assert_all(cursor, "SELECT k FROM ks.test WHERE v = 0", [[0]])
 
-    def test_tracing_prevents_startup_after_upgrading(self, 
fixture_dtest_setup):
+    def test_tracing_prevents_startup_after_upgrading(self):
         """
         Test that after upgrading from 2.1 to 3.0, the system_traces.sessions 
table is properly upgraded to include
         the client column.
@@ -5476,13 +5476,6 @@ class TestCQL(UpgradeTester):
         cursor.execute("CREATE KEYSPACE foo WITH replication = {'class': 
'SimpleStrategy', 'replication_factor': 1}")
         cursor.execute("CREATE TABLE foo.bar (k int PRIMARY KEY, v int)")
 
-        #It's possible to log an error when reading trace information because 
the schema at node differs
-        #between versions
-        if self.is_40_or_greater():
-            fixture_dtest_setup.ignore_log_patterns = 
fixture_dtest_setup.ignore_log_patterns +\
-                                                      ["Unknown column 
coordinator_port during deserialization",
-                                                       "Unknown column 
source_port during deserialization"]
-
         for is_upgraded, cursor in self.do_upgrade(cursor):
             logger.debug("Querying {} node".format("upgraded" if is_upgraded 
else "old"))
 


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

Reply via email to