This is an automated email from the ASF dual-hosted git repository.
jonmeredith pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit c9a7269874032381dfebeee61073e1a37378f49c
Merge: 8a9ba8866d ba0555e965
Author: Jon Meredith <jonmered...@apache.org>
AuthorDate: Mon Jun 6 11:04:41 2022 -0600
Merge branch 'cassandra-3.0' into cassandra-3.11
.../distributed/test/MessageForwardingTest.java | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --cc
test/distributed/org/apache/cassandra/distributed/test/MessageForwardingTest.java
index 61ccb5fcf3,cc54711d8d..895772364c
---
a/test/distributed/org/apache/cassandra/distributed/test/MessageForwardingTest.java
+++
b/test/distributed/org/apache/cassandra/distributed/test/MessageForwardingTest.java
@@@ -66,6 -73,21 +71,21 @@@ public class MessageForwardingTest exte
//noinspection ResultOfMethodCallIgnored
inserts.map(IsolatedExecutor::waitOn).count();
+ // Tracing is async with respect to queries, just because the
query has completed it does not mean
+ // all tracing updates have completed. The tracing executor
serializes work, so run a task through
+ // and everthing submitted before must have completed.
+ cluster.forEach(instance -> instance.runOnInstance(() -> {
- Future<?> result =
StageManager.getStage(Stage.TRACING).submit(NO_OP_TASK);
++ Future<?> result =
StageManager.getStage(Stage.TRACING).submit(() -> null);
+ try
+ {
+ result.get(30, TimeUnit.SECONDS);
+ }
+ catch (ExecutionException | InterruptedException |
TimeoutException ex)
+ {
+ throw new RuntimeException(ex);
+ }
+ }));
+
cluster.forEach(instance ->
commitCounts.put(instance.broadcastAddress().getAddress(), 0));
List<TracingUtil.TraceEntry> traces =
TracingUtil.getTrace(cluster, sessionId, ConsistencyLevel.ALL);
traces.forEach(traceEntry -> {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
