This is an automated email from the ASF dual-hosted git repository.
bereng 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 bcd094b1 Broken test_rolling_upgrade -
upgrade_tests.upgrade_through_versions_test.TestUpgrade_indev_3_0_x_To_indev_4_0_x
bcd094b1 is described below
commit bcd094b19f8c771ea8fa4aad73fbfda72621eb4c
Author: Bereng <berenguerbl...@gmail.com>
AuthorDate: Tue Apr 5 10:17:22 2022 +0200
Broken test_rolling_upgrade -
upgrade_tests.upgrade_through_versions_test.TestUpgrade_indev_3_0_x_To_indev_4_0_x
patch by Berenguer Blasi; reviewed by Josh McKenzie for CASSANDRA-17140
---
upgrade_tests/upgrade_through_versions_test.py | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/upgrade_tests/upgrade_through_versions_test.py
b/upgrade_tests/upgrade_through_versions_test.py
index c2f394b7..392e5f13 100644
--- a/upgrade_tests/upgrade_through_versions_test.py
+++ b/upgrade_tests/upgrade_through_versions_test.py
@@ -15,7 +15,7 @@ from collections import defaultdict, namedtuple
from multiprocessing import Process, Queue
from queue import Empty, Full
-from cassandra import ConsistencyLevel, WriteTimeout
+from cassandra import ConsistencyLevel, WriteTimeout, DriverException
from cassandra.query import SimpleStatement
from dtest import RUN_STATIC_UPGRADE_MATRIX, Tester
@@ -77,6 +77,14 @@ def data_writer(tester, to_verify_queue,
verification_done_queue, rewrite_probab
session.execute(prepared, (val, key))
to_verify_queue.put((key, val,))
+ except DriverException as dex:
+ if "ID mismatch while trying to reprepare" in str(dex):
+ time.sleep(1) # Pstmnt id mismatch, retry. See
CASSANDRA-15252/17140
+ continue
+ else:
+ logger.error("Error in data writer process!", dex)
+ shutdown_gently()
+ raise
except Exception as ex:
logger.error("Error in data writer process!", ex)
shutdown_gently()
@@ -126,6 +134,14 @@ def data_checker(tester, to_verify_queue,
verification_done_queue):
time.sleep(1) # let's not eat CPU if the queue is empty
logger.info("to_verify_queue is empty: %d" %
to_verify_queue.qsize())
continue
+ except DriverException as dex:
+ if "ID mismatch while trying to reprepare" in str(dex):
+ time.sleep(1) # Pstmnt id mismatch, retry. See
CASSANDRA-15252/17140
+ continue
+ else:
+ logger.error("Error in data checker process!", dex)
+ shutdown_gently()
+ raise
except Exception as ex:
logger.error("Error in data checker process!", ex)
shutdown_gently()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
