From 78ab7eef904ef549d0d7a34332b83d6110e0762d Mon Sep 17 00:00:00 2001 From: Alex Petrov Date: Wed, 29 Jan 2025 19:54:53 +0100 Subject: [PATCH] Fix argument order in topology reporting Patch by Alex Petrov, reviewed by Ariel Weisberg for CASSANDRA-20245 --- .../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 45ea3ca3a..92048bd96 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 void reportTopology(Topology topology, boolean isLoad, boolean startSync) { 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 void reportTopology(Topology topology, boolean isLoad, boolean startSync) 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; }