Skip to content

Replace blocking wait with non-blocking delay in paxos repair #4434

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: trunk
Choose a base branch
from
+88 −30
Open

Replace blocking wait with non-blocking delay in paxos repair #4434

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c2b8f66
Replace blocking wait with non-blocking delay in paxos repair
bdeggleston Oct 22, 2025
63ebcd7
review feedback
bdeggleston Oct 23, 2025
bfd6d1e
fix completion check
bdeggleston Oct 23, 2025
a47841b
use priority queue
bdeggleston Oct 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions src/java/org/apache/cassandra/service/paxos/cleanup/PaxosCleanupLocalCoordinator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,12 @@
package org.apache.cassandra.service.paxos.cleanup;

import java.util.Collection;
import java.util.Comparator;
import java.util.Map;
import java.util.PriorityQueue;
import java.util.Queue;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.LinkedBlockingQueue;

import com.google.common.base.Preconditions;
import org.slf4j.Logger;
Expand Down Expand Up @@ -65,6 +66,20 @@ private static class DelayedRepair
private final UncommittedPaxosKey uncommitted;
private final long scheduledAtNanos;

private static Comparator<DelayedRepair> PRIORITY_COMPARATOR = new Comparator<DelayedRepair>()
{
@Override
public int compare(DelayedRepair o1, DelayedRepair o2)
{
long delta = o1.scheduledAtNanos - o2.scheduledAtNanos;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Long.compare?

if (delta > 0)
return 1;
if (delta < 0)
return -1;
return 0;
}
};

public DelayedRepair(UncommittedPaxosKey uncommitted, long sleepMillis)
{
this.uncommitted = uncommitted;
Expand All @@ -88,7 +103,7 @@ public boolean isRunnable()
private final boolean autoRepair;

private final Map<DecoratedKey, AbstractPaxosRepair> inflight = new ConcurrentHashMap<>();
private final Queue<DelayedRepair> delayed = new LinkedBlockingQueue<>();
private final Queue<DelayedRepair> delayed = new PriorityQueue<>(DelayedRepair.PRIORITY_COMPARATOR);
private final PaxosTableRepairs tableRepairs;

private PaxosCleanupLocalCoordinator(SharedContext ctx, UUID session, TableId tableId, Collection<Range<Token>> ranges, CloseableIterator<UncommittedPaxosKey> uncommittedIter, boolean autoRepair)
Expand Down