Skip to content

HDDS-6890. EC: Fix potential wrong replica read with over-replicated container. #3523

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
umamaheswararao merged 3 commits into from
Jun 17, 2022
Merged

HDDS-6890. EC: Fix potential wrong replica read with over-replicated container. #3523

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d6da0f5
HDDS-6890. EC: Fix potential wrong replica read with over-replicated …
Jun 16, 2022
5db339f
Extract lambda into a member method and add ut for it.
Jun 17, 2022
9e663d1
Remove unintended remove of new line.
Jun 17, 2022
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
26 changes: 23 additions & 3 deletions hadoop-hdds/client/src/main/java/org/apache/hadoop/ozone/client/io/ECBlockInputStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import java.io.EOFException;
import java.io.IOException;
import java.util.Arrays;
import java.util.Collections;
import java.util.function.Function;

/**
Expand Down Expand Up @@ -169,9 +170,9 @@ protected BlockExtendedInputStream getOrOpenStream(int locationIndex) {
.setId(PipelineID.randomId())
.setState(Pipeline.PipelineState.CLOSED)
.build();

BlockID blockID = blockInfo.getBlockID();
BlockLocationInfo blkInfo = new BlockLocationInfo.Builder()
.setBlockID(blockInfo.getBlockID())
.setBlockID(blockID)
.setLength(internalBlockLength(locationIndex + 1))
.setPipeline(blockInfo.getPipeline())
.setToken(blockInfo.getToken())
Expand All @@ -182,7 +183,26 @@ protected BlockExtendedInputStream getOrOpenStream(int locationIndex) {
HddsProtos.ReplicationFactor.ONE),
blkInfo, pipeline,
blockInfo.getToken(), verifyChecksum, xceiverClientFactory,
refreshFunction);
blkID -> {
Pipeline ecPipeline = refreshFunction.apply(blkID);
if (ecPipeline == null) {
return null;
}
DatanodeDetails curIndexNode = ecPipeline.getNodes()
.stream().filter(dn ->
ecPipeline.getReplicaIndex(dn) == locationIndex + 1)
.findAny().orElse(null);
if (curIndexNode == null) {
return null;
}
return Pipeline.newBuilder().setReplicationConfig(
StandaloneReplicationConfig.getInstance(
HddsProtos.ReplicationFactor.ONE))
.setNodes(Collections.singletonList(curIndexNode))
.setId(PipelineID.randomId())
.setState(Pipeline.PipelineState.CLOSED)
.build();
});
blockStreams[locationIndex] = stream;
}
return stream;
Expand Down