Skip to content

Commit

Permalink
Fix argument order in topology reporting
Browse files Browse the repository at this point in the history
Patch by Alex Petrov, reviewed by Ariel Weisberg for CASSANDRA-20245
  • Loading branch information
ifesdjeen committed Feb 1, 2025
1 parent e5e108a commit 78ab7ee
Showing 1 changed file with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -340,22 +340,22 @@ 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;
}

long lastAcked = epochs.lastAcknowledged();
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;
}

Expand Down

0 comments on commit 78ab7ee

Please sign in to comment.