This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
The following commit(s) were added to refs/heads/trunk by this push:
new 4b7b860e Add @pytest.mark.no_vnodes to upgrade_tests/cql_tests that
are using an ordered partitioner
4b7b860e is described below
commit 4b7b860e7b4351cb72ae7f28908aebce644a89cd
Author: Mick Semb Wever <m...@apache.org>
AuthorDate: Wed Sep 13 09:43:46 2023 +0200
Add @pytest.mark.no_vnodes to upgrade_tests/cql_tests that are using an
ordered partitioner
And fix storage_engine_upgrade_test.py and upgrade_through_versions_test.py
so node2 has same dc as node1
patch by Mick Semb Wever; reviewed by Brandon Williams, Ekaterina
Dimitrova, Josh McKenzie, Maxim Muzafarov for CASSANDRA-18832
---
upgrade_tests/cql_tests.py | 10 ++++++++++
upgrade_tests/storage_engine_upgrade_test.py | 2 +-
upgrade_tests/upgrade_through_versions_test.py | 2 +-
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/upgrade_tests/cql_tests.py b/upgrade_tests/cql_tests.py
index 0b5f71cb..3e791a32 100644
--- a/upgrade_tests/cql_tests.py
+++ b/upgrade_tests/cql_tests.py
@@ -303,6 +303,7 @@ class TestCQL(UpgradeTester):
[24, 'Something something', 'Frodo Baggins'],
[30, 'Yet one more message', None]])
+ @pytest.mark.no_vnodes
def test_limit_ranges(self):
""" Validate LIMIT option for 'range queries' in SELECT statements """
cursor = self.prepare(ordered=True)
@@ -1137,6 +1138,7 @@ class TestCQL(UpgradeTester):
assert_all(cursor, "SELECT * FROM users WHERE KEY='user1'", [])
+ @pytest.mark.no_vnodes
def test_undefined_column_handling(self):
cursor = self.prepare(ordered=True)
@@ -1663,6 +1665,7 @@ class TestCQL(UpgradeTester):
cursor.execute("INSERT INTO test (k, c) VALUES (2, 2)")
assert_one(cursor, "SELECT * FROM test", [2, 2, None, None])
+ @pytest.mark.no_vnodes
def test_only_pk(self):
"""
Check table with only a PK (part of #4361)
@@ -1763,6 +1766,7 @@ class TestCQL(UpgradeTester):
assert_row_count(cursor, 'test', 2)
+ @pytest.mark.no_vnodes
def test_composite_index_with_pk(self):
cursor = self.prepare(ordered=True)
@@ -1826,6 +1830,7 @@ class TestCQL(UpgradeTester):
assert_invalid(cursor, "SELECT content FROM blogs WHERE time1
= 1 AND time2 = 1 AND author='foo'")
assert_invalid(cursor, "SELECT content FROM blogs WHERE time1
= 1 AND time2 > 0 AND author='foo'")
+ @pytest.mark.no_vnodes
def test_limit_bugs(self):
"""
Test for LIMIT bugs from #4579
@@ -1914,6 +1919,7 @@ class TestCQL(UpgradeTester):
assert_invalid(cursor, "SELECT * FROM compositetest WHERE
ctime>=12345679 AND key='key3' AND ctime<=12345680 LIMIT 3;")
assert_invalid(cursor, "SELECT * FROM compositetest WHERE
ctime=12345679 AND key='key3' AND ctime<=12345680 LIMIT 3;")
+ @pytest.mark.no_vnodes
def test_order_by_multikey(self):
"""
Test for #4612 bug and more generally order by when multiple C* rows
are queried
@@ -2341,6 +2347,7 @@ class TestCQL(UpgradeTester):
assert_one(cursor, "SELECT l1, l2 FROM test WHERE k = 0", [[1, 24,
3], [4, 42, 6]])
+ @pytest.mark.no_vnodes
def test_composite_index_collections(self):
cursor = self.prepare(ordered=True)
cursor.execute("""
@@ -2370,6 +2377,7 @@ class TestCQL(UpgradeTester):
assert_all(cursor, query, [[1, set(['bar1', 'bar2'])], [1,
set(['bar2', 'bar3'])], [2, set(['baz'])]])
@pytest.mark.skip("https://issues.apache.org/jira/browse/CASSANDRA-14961";)
+ @pytest.mark.no_vnodes
def test_truncate_clean_cache(self):
cursor = self.prepare(ordered=True, use_cache=True)
@@ -3212,6 +3220,7 @@ class TestCQL(UpgradeTester):
assert_invalid(cursor, "DELETE FROM test2 WHERE k = 0 AND i >
0 IF EXISTS")
assert_invalid(cursor, "DELETE FROM test2 WHERE k = 0 AND i >
0 IF v = 'foo'")
+ @pytest.mark.no_vnodes
def test_range_key_ordered(self):
cursor = self.prepare(ordered=True)
@@ -3358,6 +3367,7 @@ class TestCQL(UpgradeTester):
assert_one(cursor, "SELECT * FROM test", [1, set([2])])
+ @pytest.mark.no_vnodes
def test_select_distinct(self):
cursor = self.prepare(ordered=True)
diff --git a/upgrade_tests/storage_engine_upgrade_test.py
b/upgrade_tests/storage_engine_upgrade_test.py
index cb0880f6..37ac9e9b 100644
--- a/upgrade_tests/storage_engine_upgrade_test.py
+++ b/upgrade_tests/storage_engine_upgrade_test.py
@@ -74,7 +74,7 @@ class TestStorageEngineUpgrade(Tester):
cluster.set_install_dir(install_dir=self.fixture_dtest_setup.default_install_dir)
self.install_nodetool_legacy_parsing()
# Add a new node, bootstrap=True ensures that it is not a seed
- node2 = new_node(cluster, bootstrap=True)
+ node2 = new_node(cluster, bootstrap=True,
data_center=node1.data_center)
node2.start(wait_for_binary_proto=True,
jvm_args=self.fixture_dtest_setup.jvm_args)
temp_files = self.glob_data_dirs(os.path.join('*', "tmp", "*.dat"))
diff --git a/upgrade_tests/upgrade_through_versions_test.py
b/upgrade_tests/upgrade_through_versions_test.py
index d88249f9..939dd1a5 100644
--- a/upgrade_tests/upgrade_through_versions_test.py
+++ b/upgrade_tests/upgrade_through_versions_test.py
@@ -811,7 +811,7 @@ class BootstrapMixin(object):
def _bootstrap_new_node(self):
# Check we can bootstrap a new node on the upgraded cluster:
logger.debug("Adding a node to the cluster")
- nnode = new_node(self.cluster, remote_debug_port=str(2000 +
len(self.cluster.nodes)))
+ nnode = new_node(self.cluster, remote_debug_port=str(2000 +
len(self.cluster.nodes)), data_center=self.cluster.nodelist()[0].data_center)
if nnode.get_cassandra_version() >= '4.2':
nnode.set_configuration_options({'enable_scripted_user_defined_functions':
'false'})
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
