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 24b58342 Flaky test_rolling_upgrade
24b58342 is described below

commit 24b58342eca597b375a424d08b64f6d001bc220a
Author: Bereng <berenguerbl...@gmail.com>
AuthorDate: Tue Aug 9 08:44:23 2022 +0200

    Flaky test_rolling_upgrade
    
    patch by Berenguer Blasi; reviewed by Benjamin Lerer for CASSANDRA-17806
---
 upgrade_tests/upgrade_through_versions_test.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/upgrade_tests/upgrade_through_versions_test.py 
b/upgrade_tests/upgrade_through_versions_test.py
index 746772aa..47f54281 100644
--- a/upgrade_tests/upgrade_through_versions_test.py
+++ b/upgrade_tests/upgrade_through_versions_test.py
@@ -210,6 +210,14 @@ def counter_incrementer(tester, to_verify_queue, 
verification_done_queue, rewrit
             session.execute(prepared, (key))
 
             to_verify_queue.put_nowait((key, count + 1,))
+        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 counter incrementer process!", dex)
+                shutdown_gently()
+                raise
         except Exception as ex:
             logger.error("Error in counter incrementer process!", ex)
             shutdown_gently()
@@ -258,6 +266,14 @@ def counter_checker(tester, to_verify_queue, 
verification_done_queue):
         except Empty:
             time.sleep(0.1)  # let's not eat CPU if the queue is empty
             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 counter verifier process!", dex)
+                shutdown_gently()
+                raise
         except Exception as ex:
             logger.error("Error in counter verifier process!", ex)
             shutdown_gently()


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

Reply via email to