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 01a647f Broken test_speculative_data_request
01a647f is described below
commit 01a647f4a1ec42d42198fe4c49fe654a7705d7d7
Author: Bereng <berenguerbl...@gmail.com>
AuthorDate: Mon Nov 8 07:45:47 2021 +0100
Broken test_speculative_data_request
patch by Berenguer Blasi; reviewed by Brandon Williams for CASSANDRA-17119
---
byteman/{ => post4.0}/request_verb_timing.btm | 0
byteman/request_verb_timing.btm | 4 ++--
read_repair_test.py | 6 +++++-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/byteman/request_verb_timing.btm
b/byteman/post4.0/request_verb_timing.btm
similarity index 100%
copy from byteman/request_verb_timing.btm
copy to byteman/post4.0/request_verb_timing.btm
diff --git a/byteman/request_verb_timing.btm b/byteman/request_verb_timing.btm
index c42968e..e0dc68e 100644
--- a/byteman/request_verb_timing.btm
+++ b/byteman/request_verb_timing.btm
@@ -3,10 +3,10 @@ CLASS org.apache.cassandra.net.MessagingService
METHOD doSend
AT ENTRY
BIND prefix:String = "org.jboss.byteman."; # byteman in strict mode requires
the o.j.b prefix
- toHost:String = $to.getAddress().toString();
+ toHost:String = $to.address.toString();
verb:String = $message.header.verb.toString();
prop:String = prefix + "|request_verb_timing|" + toHost + "|" + verb;
IF true
DO
System.setProperty(prop, String.valueOf(System.currentTimeMillis()));
-ENDRULE
+ENDRULE
\ No newline at end of file
diff --git a/read_repair_test.py b/read_repair_test.py
index f3cb6c2..ee189d5 100644
--- a/read_repair_test.py
+++ b/read_repair_test.py
@@ -606,7 +606,11 @@ class TestSpeculativeReadRepair(Tester):
node2.byteman_submit(['-u', './byteman/read_repair/stop_writes.btm'])
node1.byteman_submit(['./byteman/read_repair/sorted_live_endpoints.btm'])
- node1.byteman_submit(['./byteman/request_verb_timing.btm'])
+ version = self.cluster.cassandra_version()
+ if version < '4.1':
+ node1.byteman_submit(['./byteman/request_verb_timing.btm'])
+ else:
+ node1.byteman_submit(['./byteman/post4.0/request_verb_timing.btm'])
with StorageProxy(node1) as storage_proxy:
assert storage_proxy.blocking_read_repair == 0
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
