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 c7e77df4 Update trunk to version 5.1
c7e77df4 is described below
commit c7e77df4b460b24d5d42ae6836903ce642f4e651
Author: Mick Semb Wever <[email protected]>
AuthorDate: Tue Aug 8 19:01:17 2023 +0300
Update trunk to version 5.1
- update dtest upgrade paths
patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-18705
---
upgrade_tests/upgrade_manifest.py | 22 ++++++++++++++++------
upgrade_tests/upgrade_through_versions_test.py | 11 +++++++++--
2 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/upgrade_tests/upgrade_manifest.py
b/upgrade_tests/upgrade_manifest.py
index f7838cb5..adf16757 100644
--- a/upgrade_tests/upgrade_manifest.py
+++ b/upgrade_tests/upgrade_manifest.py
@@ -27,7 +27,8 @@ CASSANDRA_3_11 = '3.11'
CASSANDRA_4_0 = '4.0'
CASSANDRA_4_1 = '4.1'
CASSANDRA_5_0 = '5.0'
-TRUNK = CASSANDRA_5_0
+CASSANDRA_5_1 = '5.1'
+TRUNK = CASSANDRA_5_1
RUN_STATIC_UPGRADE_MATRIX = os.environ.get('RUN_STATIC_UPGRADE_MATRIX',
'').lower() in ('yes', 'true')
@@ -105,6 +106,8 @@ def set_version_family():
version_family = CASSANDRA_4_1
elif current_version.vstring.startswith('5.0'):
version_family = CASSANDRA_5_0
+ elif current_version.vstring.startswith('5.1'):
+ version_family = CASSANDRA_5_1
else:
# when this occurs, it's time to update this manifest a bit!
raise RuntimeError("Testing upgrades from/to version %s is not
supported. Please use a custom manifest (see upgrade_manifest.py)" %
current_version.vstring)
@@ -171,8 +174,12 @@ current_4_0_x = VersionMeta(name='current_4_0_x',
family=CASSANDRA_4_0, variant=
indev_4_1_x = VersionMeta(name='indev_4_1_x', family=CASSANDRA_4_1,
variant='indev', version='github:apache/cassandra-4.1', min_proto_v=4,
max_proto_v=5, java_versions=(8,11))
current_4_1_x = VersionMeta(name='current_4_1_x', family=CASSANDRA_4_1,
variant='current', version='4.1.3', min_proto_v=4, max_proto_v=5,
java_versions=(8,11))
+indev_5_0_x = VersionMeta(name='indev_5_0_x', family=CASSANDRA_5_0,
variant='indev', version='github:apache/cassandra-5.0', min_proto_v=4,
max_proto_v=5, java_versions=(11,17))
+# uncomment when 5.0-alpha1 is released
+#current_5_0_x = VersionMeta(name='current_5_0_x', family=CASSANDRA_5_0,
variant='current', version='5.0-alpha1', min_proto_v=4, max_proto_v=5,
java_versions=(11,17))
+
indev_trunk = VersionMeta(name='indev_trunk', family=TRUNK, variant='indev',
version='github:apache/trunk', min_proto_v=4, max_proto_v=5,
java_versions=(11,17))
-# current_5_0_x = VersionMeta(name='current_5_0_x', family=CASSANDRA_5_0,
variant='current', version='5.0-alpha1', min_proto_v=4, max_proto_v=5,
java_versions=(11,))
+# current_5_1_x = VersionMeta(name='current_5_1_x', family=CASSANDRA_5_1,
variant='current', version='5.1-alpha1', min_proto_v=4, max_proto_v=5,
java_versions=(11,17))
# MANIFEST maps a VersionMeta representing a line/variant to a list of other
VersionMeta's representing supported upgrades
@@ -188,15 +195,18 @@ MANIFEST = {
current_2_2_x: [indev_2_2_x, indev_3_0_x, indev_3_11_x],
current_3_0_x: [indev_3_0_x, indev_3_11_x, indev_4_0_x, indev_4_1_x],
current_3_11_x: [indev_3_11_x, indev_4_0_x, indev_4_1_x],
- current_4_0_x: [indev_4_0_x, indev_4_1_x, indev_trunk],
- current_4_1_x: [indev_4_1_x, indev_trunk],
+ current_4_0_x: [indev_4_0_x, indev_4_1_x, indev_5_0_x, indev_trunk],
+ current_4_1_x: [indev_4_1_x, indev_5_0_x, indev_trunk],
+ # uncomment when 5.0-alpha1 is released
+ #current_5_0_x: [indev_5_0_x, indev_trunk],
indev_2_1_x: [indev_2_2_x, indev_3_0_x, indev_3_11_x],
indev_2_2_x: [indev_3_0_x, indev_3_11_x],
indev_3_0_x: [indev_3_11_x, indev_4_0_x, indev_4_1_x],
indev_3_11_x: [indev_4_0_x, indev_4_1_x],
- indev_4_0_x: [indev_4_1_x, indev_trunk],
- indev_4_1_x: [indev_trunk]
+ indev_4_0_x: [indev_4_1_x, indev_5_0_x, indev_trunk],
+ indev_4_1_x: [indev_5_0_x, indev_trunk],
+ indev_5_0_x: [indev_trunk]
}
def _have_common_proto(origin_meta, destination_meta):
diff --git a/upgrade_tests/upgrade_through_versions_test.py
b/upgrade_tests/upgrade_through_versions_test.py
index 33972104..ad218450 100644
--- a/upgrade_tests/upgrade_through_versions_test.py
+++ b/upgrade_tests/upgrade_through_versions_test.py
@@ -380,7 +380,10 @@ class TestUpgrade(Tester):
self.prepare()
self.row_values = set()
cluster = self.cluster
- if cluster.version() >= '3.0':
+ if cluster.version() >= '5.0':
+
cluster.set_configuration_options({'user_defined_functions_threads_enabled':
'true',
+
'scripted_user_defined_functions_enabled': 'false'})
+ elif cluster.version() >= '3.0':
cluster.set_configuration_options({'enable_user_defined_functions': 'true',
'enable_scripted_user_defined_functions': 'true'})
elif cluster.version() >= '2.2':
@@ -526,6 +529,7 @@ class TestUpgrade(Tester):
if internode_ssl and (LooseVersion(version_meta.family) >=
CASSANDRA_4_0):
node.set_configuration_options({'server_encryption_options':
{'enabled': True, 'enable_legacy_ssl_storage_port': True}})
if LooseVersion(version_meta.family) >= CASSANDRA_5_0:
+ # only clusters starting from <5.0 will have
enable_scripted_user_defined_functions=true
node.set_configuration_options({'enable_scripted_user_defined_functions':
'false'})
# hacky? yes. We could probably extend ccm to allow this publicly.
@@ -810,7 +814,10 @@ class BootstrapMixin(object):
self.prepare()
cluster = self.cluster
- if cluster.version() >= '3.0':
+ if cluster.version() >= '5.0':
+
cluster.set_configuration_options({'user_defined_functions_threads_enabled':
'true',
+
'scripted_user_defined_functions_enabled': 'false'})
+ elif cluster.version() >= '3.0':
cluster.set_configuration_options({'enable_user_defined_functions': 'true',
'enable_scripted_user_defined_functions': 'true'})
elif cluster.version() >= '2.2':
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
