Merge branch 'release-3.22' into private_master

Author: TheRealFalcon

tests/integration/advanced/graph/test_graph_query.py

@@ -162,7 +162,7 @@ def test_profile_graph_options(self):
         except NoHostAvailable:
             self.assertTrue(DSE_VERSION >= Version("6.0"))
         except InvalidRequest:
-            self.assertTrue(DSE_VERSION >= Version("5.1"))
+            self.assertTrue(DSE_VERSION >= Version("5.0"))
         else:
             if DSE_VERSION < Version("6.8"):  # >6.8 returns true
                 self.fail("Should have risen ServerError or InvalidRequest")

tests/integration/long/test_failure_types.py

@@ -16,8 +16,8 @@
 import sys
 import traceback
 import time
+from packaging.version import Version
 
-from ccmlib.dse_cluster import DseCluster
 from mock import Mock
 
 from cassandra.policies import HostFilterPolicy, RoundRobinPolicy
@@ -31,7 +31,7 @@
 from tests.integration import (
     use_singledc, PROTOCOL_VERSION, get_cluster, setup_keyspace, remove_cluster,
     get_node, start_cluster_wait_for_up, requiresmallclockgranularity,
-    local)
+    local, CASSANDRA_VERSION)
 
 
 try:
@@ -55,7 +55,10 @@ def setup_module():
         use_singledc(start=False)
         ccm_cluster = get_cluster()
         ccm_cluster.stop()
-        config_options = {'guardrails.tombstone_failure_threshold': 2000, 'guardrails.tombstone_warn_threshold': 1000}
+        config_options = {
+            'tombstone_failure_threshold': 2000,
+            'tombstone_warn_threshold': 1000,
+        }
         ccm_cluster.set_configuration_options(config_options)
         start_cluster_wait_for_up(ccm_cluster)
         setup_keyspace()
@@ -255,7 +258,8 @@ def test_tombstone_overflow_read_failure(self):
         parameters = [(x,) for x in range(3000)]
         self.execute_concurrent_args_helper(self.session, statement, parameters)
 
-        statement = self.session.prepare("DELETE FROM test3rf.test2 WHERE k = 1 AND v0 =?")
+        column = 'v1' if CASSANDRA_VERSION < Version('4.0') else ''
+        statement = self.session.prepare("DELETE {} FROM test3rf.test2 WHERE k = 1 AND v0 =?".format(column))
         parameters = [(x,) for x in range(2001)]
         self.execute_concurrent_args_helper(self.session, statement, parameters)