You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by if...@apache.org on 2020/12/08 07:25:24 UTC
[cassandra-dtest] branch trunk updated: Follow-up: remove tests
deprecated by CASSANDRA-16217
This is an automated email from the ASF dual-hosted git repository.
ifesdjeen 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 6f97913 Follow-up: remove tests deprecated by CASSANDRA-16217
new 6428562 Merge pull request #104 from ifesdjeen/CASSANDRA-16217-followup
6f97913 is described below
commit 6f97913eef843d449afd4cabaa7e78a73e9b226b
Author: Alex Petrov <ol...@gmail.com>
AuthorDate: Fri Nov 20 16:21:43 2020 +0100
Follow-up: remove tests deprecated by CASSANDRA-16217
Patch by Alex Petrov; reviewed by Ekaterina Dimitrova for CASSANDRA-16217
---
upgrade_tests/upgrade_compact_storage.py | 116 -------------------------------
1 file changed, 116 deletions(-)
diff --git a/upgrade_tests/upgrade_compact_storage.py b/upgrade_tests/upgrade_compact_storage.py
index 6732285..46b8e8e 100644
--- a/upgrade_tests/upgrade_compact_storage.py
+++ b/upgrade_tests/upgrade_compact_storage.py
@@ -53,25 +53,6 @@ class TestUpgradeSuperColumnsThrough(Tester):
cluster.start()
return cluster
- def test_upgrade_compact_storage(self):
- cluster = self.prepare(cassandra_version='github:apache/cassandra-3.0')
- node = self.cluster.nodelist()[0]
- session = self.patient_cql_connection(node, row_factory=dict_factory)
-
- session.execute("CREATE KEYSPACE ks WITH replication = {'class': 'SimpleStrategy','replication_factor': '1' };")
- session.execute("CREATE TABLE ks.compact_table (pk int PRIMARY KEY, col1 int, col2 int) WITH COMPACT STORAGE")
-
- for i in range(1, 5):
- session.execute("INSERT INTO ks.compact_table (pk, col1, col2) VALUES ({i}, {i}, {i})".format(i=i))
-
- self.upgrade_to_version(VERSION_TRUNK, wait=False)
- self.fixture_dtest_setup.allow_log_errors = True
-
- time.sleep(5)
- # After restart, it won't start
- errors = len(node.grep_log("Compact Tables are not allowed in Cassandra starting with 4.0 version"))
- assert errors > 0
-
def test_mixed_cluster(self):
cluster = self.prepare(num_nodes=2, cassandra_version=VERSION_311)
node1, node2 = self.cluster.nodelist()
@@ -113,40 +94,6 @@ class TestUpgradeSuperColumnsThrough(Tester):
assert (list(session.execute("SELECT * FROM ks.compact_table WHERE pk = 1")) ==
[{'col2': 1, 'pk': 1, 'column1': None, 'value': None, 'col1': 1}])
- def test_force_readd_compact_storage(self):
- cluster = self.prepare(cassandra_version=VERSION_311)
- node = self.cluster.nodelist()[0]
- session = self.patient_cql_connection(node, row_factory=dict_factory)
-
- session.execute("CREATE KEYSPACE ks WITH replication = {'class': 'SimpleStrategy','replication_factor': '1' };")
- session.execute("CREATE TABLE ks.compact_table (pk int PRIMARY KEY, col1 int, col2 int) WITH COMPACT STORAGE")
-
- for i in range(1, 5):
- session.execute("INSERT INTO ks.compact_table (pk, col1, col2) VALUES ({i}, {i}, {i})".format(i=i))
-
- session.execute("ALTER TABLE ks.compact_table DROP COMPACT STORAGE")
-
- self.upgrade_to_version(VERSION_TRUNK, wait=True)
-
- session = self.patient_cql_connection(node, row_factory=dict_factory)
- session.execute("update system_schema.tables set flags={} where keyspace_name='ks' and table_name='compact_table';")
-
- assert (list(session.execute("SELECT * FROM ks.compact_table WHERE pk = 1")) ==
- [{'col2': 1, 'pk': 1, 'column1': None, 'value': None, 'col1': 1}])
-
- self.fixture_dtest_setup.allow_log_errors = True
-
- node.stop(wait_other_notice=False)
- node.set_install_dir(version=VERSION_TRUNK)
- try:
- node.start(wait_other_notice=False, wait_for_binary_proto=False, verbose=False)
- except NodeError:
- print("error") # ignore
- time.sleep(5)
- # After restart, it won't start
- errors = len(node.grep_log("Compact Tables are not allowed in Cassandra starting with 4.0 version"))
- assert errors > 0
-
def test_upgrade_with_dropped_compact_storage_index(self):
cluster = self.prepare(cassandra_version=VERSION_311)
node = self.cluster.nodelist()[0]
@@ -178,66 +125,3 @@ class TestUpgradeSuperColumnsThrough(Tester):
[{'col1': '50', 'column1': None, 'pk': '5', 'value': None}])
assert (list(session.execute("SELECT * FROM ks.compact_table WHERE pk = '5'")) ==
[{'col1': '50', 'column1': None, 'pk': '5', 'value': None}])
-
- def test_downgrade_after_failed_upgrade(self):
- """
- The purpose of this test is to show that after verifying early in the startup process in Cassandra 4.0 that
- COMPACT STORAGE was not removed prior start of an upgrade, users can still successfully downgrade, remove the
- COMPACT STORAGE, and restart the upgrade process.
- @jira_ticket CASSANDRA-16063
- """
- self.prepare(cassandra_version=VERSION_311)
- node = self.cluster.nodelist()[0]
- session = self.patient_cql_connection(node, row_factory=dict_factory)
-
- session.execute("CREATE KEYSPACE ks WITH replication = {'class': 'SimpleStrategy','replication_factor': '1' };")
- session.execute("CREATE TABLE ks.compact_table (pk ascii PRIMARY KEY, col1 ascii) WITH COMPACT STORAGE")
- session.execute("CREATE INDEX ON ks.compact_table(col1)")
-
- for i in range(1, 10):
- session.execute("INSERT INTO ks.compact_table (pk, col1) VALUES ('{pk}', '{col1}')".format(pk=i, col1=i * 10))
-
- assert (list(session.execute("SELECT * FROM ks.compact_table WHERE col1 = '50'")) ==
- [{'pk': '5', 'col1': '50'}])
- assert (list(session.execute("SELECT * FROM ks.compact_table WHERE pk = '5'")) ==
- [{'pk': '5', 'col1': '50'}])
-
- logging.debug("Upgrading to current version")
-
- self.fixture_dtest_setup.allow_log_errors = True
-
- node.stop(wait_other_notice=False)
- node.set_install_dir(version=VERSION_TRUNK)
- try:
- node.start(wait_other_notice=False, wait_for_binary_proto=False, verbose=False)
- except NodeError:
- print("error") # ignore
- time.sleep(5)
- # After restart, it won't start
- errors = len(node.grep_log("Compact Tables are not allowed in Cassandra starting with 4.0 version"))
- assert errors > 0
-
- logging.debug("Downgrading to 3.11")
- node.set_install_dir(version=VERSION_311)
- logger.debug("Set new cassandra dir for %s: %s" % (node.name, node.get_install_dir()))
- self.cluster.set_install_dir(version=VERSION_311)
- self.fixture_dtest_setup.reinitialize_cluster_for_different_version()
- node.start(wait_other_notice=False, wait_for_binary_proto=False)
- logger.debug('Starting %s on new version (%s)' % (node.name, VERSION_311))
-
- session = self.patient_cql_connection(node, row_factory=dict_factory)
-
- assert (list(session.execute("SELECT * FROM ks.compact_table WHERE col1 = '50'")) ==
- [{'pk': '5', 'col1': '50'}])
- assert (list(session.execute("SELECT * FROM ks.compact_table WHERE pk = '5'")) ==
- [{'pk': '5', 'col1': '50'}])
-
- session.execute("ALTER TABLE ks.compact_table DROP COMPACT STORAGE")
-
- self.upgrade_to_version(VERSION_TRUNK, wait=True)
-
- session = self.patient_cql_connection(node, row_factory=dict_factory)
- assert (list(session.execute("SELECT * FROM ks.compact_table WHERE col1 = '50'")) ==
- [{'col1': '50', 'column1': None, 'pk': '5', 'value': None}])
- assert (list(session.execute("SELECT * FROM ks.compact_table WHERE pk = '5'")) ==
- [{'col1': '50', 'column1': None, 'pk': '5', 'value': None}])
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org