Skip to content

HDDS-11665. Minor optimizations on the write path #7407

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
adoroszlai merged 2 commits into from
Nov 12, 2024
Merged

HDDS-11665. Minor optimizations on the write path #7407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77e4a50
HDDS-11665. Minor optimizations for hbase
duongkame Nov 7, 2024
f0e69b4
checkstyle.
duongkame Nov 7, 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
2 changes: 1 addition & 1 deletion hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientRatis.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ private CompletableFuture<RaftClientReply> sendRequestAsync(
// gets the minimum log index replicated to all servers
@Override
public long getReplicatedMinCommitIndex() {
return commitInfoMap.values().parallelStream()
return commitInfoMap.values().stream()
.mapToLong(Long::longValue).min().orElse(0);
}

Expand Down
4 changes: 1 addition & 3 deletions ...ds/common/src/main/java/org/apache/hadoop/ozone/common/ChunkBufferImplWithByteBuffer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import java.util.List;
import java.util.NoSuchElementException;
import java.util.Objects;
import java.util.UUID;
import java.util.function.Function;

import org.apache.ratis.thirdparty.com.google.protobuf.ByteString;
Expand All @@ -35,7 +34,6 @@
final class ChunkBufferImplWithByteBuffer implements ChunkBuffer {
private final ByteBuffer buffer;
private final UncheckedAutoCloseable underlying;
private final UUID identity = UUID.randomUUID();

ChunkBufferImplWithByteBuffer(ByteBuffer buffer) {
this(buffer, null);
Expand Down Expand Up @@ -163,6 +161,6 @@ public int hashCode() {
@Override
public String toString() {
return getClass().getSimpleName() + ":limit=" + buffer.limit()
+ "@" + identity;
+ "@" + Integer.toHexString(super.hashCode());
}
}
2 changes: 1 addition & 1 deletion ...hdds/common/src/main/java/org/apache/hadoop/ozone/container/common/helpers/BlockData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ public void setChunks(List<ContainerProtos.ChunkInfo> chunks) {
size = singleChunk.getLen();
} else {
chunkList = chunks;
size = chunks.parallelStream()
size = chunks.stream()
.mapToLong(ContainerProtos.ChunkInfo::getLen)
.sum();
}
Expand Down
8 changes: 2 additions & 6 deletions hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/KeyOutputStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ private int writeToOutputStream(BlockOutputStreamEntry current,
if (retry) {
current.writeOnRetry(len);
} else {
waitForRetryHandling(current);
current.waitForRetryHandling(retryHandlingCondition);
current.write(b, off, writeLen);
offset += writeLen;
}
Expand Down Expand Up @@ -584,7 +584,7 @@ private void handleFlushOrClose(StreamAction op) throws IOException {
blockOutputStreamEntryPool.getCurrentStreamEntry();
if (entry != null) {
// If the current block is to handle retries, wait until all the retries are done.
waitForRetryHandling(entry);
doInWriteLock(() -> entry.waitForRetryHandling(retryHandlingCondition));
entry.registerCallReceived();
try {
handleStreamAction(entry, op);
Expand All @@ -608,10 +608,6 @@ private void handleFlushOrClose(StreamAction op) throws IOException {
}
}

private void waitForRetryHandling(BlockOutputStreamEntry currentEntry) throws InterruptedException {
doInWriteLock(() -> currentEntry.waitForRetryHandling(retryHandlingCondition));
}

private void handleStreamAction(BlockOutputStreamEntry entry,
StreamAction op) throws IOException {
Collection<DatanodeDetails> failedServers = entry.getFailedServers();
Expand Down