This is an automated email from the ASF dual-hosted git repository.
ifesdjeen pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-accord.git
The following commit(s) were added to refs/heads/trunk by this push:
new 78ab7eef Fix argument order in topology reporting
78ab7eef is described below
commit 78ab7eef904ef549d0d7a34332b83d6110e0762d
Author: Alex Petrov <[email protected]>
AuthorDate: Wed Jan 29 19:54:53 2025 +0100
Fix argument order in topology reporting
Patch by Alex Petrov, reviewed by Ariel Weisberg for CASSANDRA-20245
---
.../src/main/java/accord/impl/AbstractConfigurationService.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/accord-core/src/main/java/accord/impl/AbstractConfigurationService.java
b/accord-core/src/main/java/accord/impl/AbstractConfigurationService.java
index 45ea3ca3..92048bd9 100644
--- a/accord-core/src/main/java/accord/impl/AbstractConfigurationService.java
+++ b/accord-core/src/main/java/accord/impl/AbstractConfigurationService.java
@@ -340,7 +340,7 @@ public abstract class
AbstractConfigurationService<EpochState extends AbstractCo
{
logger.debug("Epoch {} received; waiting to receive {} before
reporting", topology.epoch(), lastReceived + 1);
fetchTopologyForEpoch(lastReceived + 1);
- epochs.receiveFuture(lastReceived + 1).addCallback(() ->
reportTopology(topology, startSync, isLoad));
+ epochs.receiveFuture(lastReceived + 1).addCallback(() ->
reportTopology(topology, isLoad, startSync));
return;
}
@@ -348,14 +348,14 @@ public abstract class
AbstractConfigurationService<EpochState extends AbstractCo
if (lastAcked == 0 && lastReceived > 0)
{
logger.debug("Epoch {} received; waiting for {} to ack before
reporting", topology.epoch(), epochs.minEpoch());
- epochs.acknowledgeFuture(epochs.minEpoch()).addCallback(() ->
reportTopology(topology, startSync, isLoad));
+ epochs.acknowledgeFuture(epochs.minEpoch()).addCallback(() ->
reportTopology(topology, isLoad, startSync));
return;
}
if (lastAcked > 0 && topology.epoch() > lastAcked + 1)
{
logger.debug("Epoch {} received; waiting for {} to ack before
reporting", topology.epoch(), lastAcked + 1);
- epochs.acknowledgeFuture(lastAcked + 1).addCallback(() ->
reportTopology(topology, startSync, isLoad));
+ epochs.acknowledgeFuture(lastAcked + 1).addCallback(() ->
reportTopology(topology, isLoad, startSync));
return;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
