This is an automated email from the ASF dual-hosted git repository. blerer pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
commit 7c42b70fe58ceb055f0d6785297e7c8780d89277 Author: Benjamin Lerer <[email protected]> AuthorDate: Tue Jun 22 11:05:00 2021 +0200 Enable DROP COMPACT for thrift upgrade tests --- upgrade_tests/thrift_upgrade_test.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/upgrade_tests/thrift_upgrade_test.py b/upgrade_tests/thrift_upgrade_test.py index 0e33de6..2cd6314 100644 --- a/upgrade_tests/thrift_upgrade_test.py +++ b/upgrade_tests/thrift_upgrade_test.py @@ -20,7 +20,6 @@ from .upgrade_manifest import build_upgrade_pairs, CASSANDRA_4_0 since = pytest.mark.since logger = logging.getLogger(__name__) - def _create_dense_super_cf(thrift, name): cfdef = Cassandra.CfDef('ks', name, column_type='Super', key_validation_class='AsciiType', # pk @@ -205,12 +204,12 @@ class TestUpgradeSuperColumnsThrough(Tester): # Update Cassandra Directory for node in nodes: node.set_install_dir(version=tag) - node.set_configuration_options(values={'start_rpc': 'true'}) + node.set_configuration_options(values={'start_rpc': 'true', 'enable_drop_compact_storage': 'true'}) logger.debug("Set new cassandra dir for %s: %s" % (node.name, node.get_install_dir())) self.cluster.set_install_dir(version=tag) self.fixture_dtest_setup.reinitialize_cluster_for_different_version() for node in nodes: - node.set_configuration_options(values={'start_rpc': 'true'}) + node.set_configuration_options(values={'start_rpc': 'true', 'enable_drop_compact_storage': 'true'}) # Restart nodes on new version for node in nodes: @@ -229,7 +228,10 @@ class TestUpgradeSuperColumnsThrough(Tester): cluster.populate(num_nodes) for node in self.cluster.nodelist(): - node.set_configuration_options(values={'start_rpc': 'true'}) + if (cassandra_version > "github:apache/cassandra-2.2"): + node.set_configuration_options(values={'start_rpc': 'true', 'enable_drop_compact_storage': 'true'}) + else: + node.set_configuration_options(values={'start_rpc': 'true'}) cluster.start() return cluster @@ -399,7 +401,7 @@ class TestUpgradeTo40(Tester): self.cluster.populate(num_nodes) for node in self.cluster.nodelist(): - node.set_configuration_options(values={'start_rpc': 'true'}) + node.set_configuration_options(values={'start_rpc': 'true', 'enable_drop_compact_storage': 'true'}) self.cluster.start() logger.debug("Started node on %s", start_version) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
