This is an automated email from the ASF dual-hosted git repository.
jlewandowski pushed a commit to branch ds-trunk-5.0--2024-07-24
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
commit 4948eddace06b1449a815825f8b027bc316fae79
Author: dan jatnieks <jatni...@pobox.com>
AuthorDate: Fri Jul 2 12:23:26 2021 -0700
STAR-386 Increase client timeout for test_simultaneous_bootstrap (#37)
Improve reliability for slow/loaded test systems by using larger client
timeout executing query.
(cherry picked from commit 18d05f6c8a84f5d3f8abb5519f07bedd198f1d97)
(cherry picked from commit 0bc8d67df1bc4811685bf7eafab415d2a228e336)
(cherry picked from commit fbea8a16fd61c4d477776235993af49842d4f3af)
(cherry picked from commit bdb7d264501feabac9ca8496e9727c0e5c61b99d)
(cherry picked from commit e5f5b9f97dd5a7f7383be52e3bf41fd7cad02a31)
(cherry picked from commit dd195a1e48066a7d57ef8aa3b86536d98fabe170)
---
bootstrap_test.py | 5 ++---
tools/assertions.py | 4 ++--
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/bootstrap_test.py b/bootstrap_test.py
index 64595661..a9b72094 100644
--- a/bootstrap_test.py
+++ b/bootstrap_test.py
@@ -928,10 +928,9 @@ class BootstrapTester(Tester):
# Repeat the select count(*) query, to help catch
# bugs like 9484, where count(*) fails at higher
# data loads.
- logger.error(node1.nodetool('status').stdout)
for _ in range(5):
- logger.error("Executing SELECT to node2")
- assert_one(session, "SELECT count(*) from keyspace1.standard1",
[500000], cl=ConsistencyLevel.ONE)
+ # Improve reliability for slower/loaded test systems by using
larger client timeout
+ assert_one(session, "SELECT count(*) from keyspace1.standard1",
[500000], cl=ConsistencyLevel.ONE, timeout=30)
def test_cleanup(self):
"""
diff --git a/tools/assertions.py b/tools/assertions.py
index 2ed8a50e..7d1b844f 100644
--- a/tools/assertions.py
+++ b/tools/assertions.py
@@ -114,7 +114,7 @@ def assert_unauthorized(session, query, message):
assert_exception(session, query, matching=message, expected=Unauthorized)
-def assert_one(session, query, expected, cl=None):
+def assert_one(session, query, expected, cl=None, timeout=None):
"""
Assert query returns one row.
@param session Session to use
@@ -127,7 +127,7 @@ def assert_one(session, query, expected, cl=None):
assert_one(session, query, [0, 0])
"""
simple_query = SimpleStatement(query, consistency_level=cl)
- res = session.execute(simple_query)
+ res = session.execute(simple_query) if timeout is None else
session.execute(simple_query, timeout=timeout)
list_res = _rows_to_list(res)
assert list_res == [expected], "Expected {} from {}, but got
{}".format([expected], query, list_res)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
