Skip to content

HDDS-11280. Add Synchronize in AbstractCommitWatcher.addAckDataLength #7032

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

Merged
jojochuang merged 3 commits into from
Aug 5, 2024
Merged

HDDS-11280. Add Synchronize in AbstractCommitWatcher.addAckDataLength #7032

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d2eef17
HDDS-11280. Remove flaky test testWriteMoreThanFlushSize for piggybac…
ashishkr200 Aug 5, 2024
481be72
HDDS-11280. Add synchronize in addAckDataLength, and revert to origin…
ashishkr200 Aug 5, 2024
7f88cf8
Use AtomicLong
ashishkr200 Aug 5, 2024
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
10 changes: 5 additions & 5 deletions ...p-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/AbstractCommitWatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import java.util.concurrent.ConcurrentSkipListMap;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicLong;

/**
* This class executes watchForCommit on ratis pipeline and releases
Expand All @@ -62,7 +63,7 @@ abstract class AbstractCommitWatcher<BUFFER> {

private final XceiverClientSpi client;

private long totalAckDataLength;
private final AtomicLong totalAckDataLength = new AtomicLong();

AbstractCommitWatcher(XceiverClientSpi client) {
this.client = client;
Expand All @@ -79,13 +80,12 @@ synchronized void updateCommitInfoMap(long index, List<BUFFER> buffers) {
}

/** @return the total data which has been acknowledged. */
synchronized long getTotalAckDataLength() {
return totalAckDataLength;
long getTotalAckDataLength() {
return totalAckDataLength.get();
}

long addAckDataLength(long acked) {
totalAckDataLength += acked;
return totalAckDataLength;
return totalAckDataLength.addAndGet(acked);
}

/**
Expand Down