Skip to content

HDDS-9659. Intermittent failure in TestOzoneECClient#testPartialStripeWithPartialChunkRetry #5601

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 1 commit into from
Nov 15, 2023
Merged

HDDS-9659. Intermittent failure in TestOzoneECClient#testPartialStripeWithPartialChunkRetry #5601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions ...zone/client/src/main/java/org/apache/hadoop/ozone/client/io/ECBlockOutputStreamEntry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,16 +91,17 @@ public class ECBlockOutputStreamEntry extends BlockOutputStreamEntry {
@Override
void checkStream() throws IOException {
if (!isInitialized()) {
blockOutputStreams =
final ECBlockOutputStream[] streams =
new ECBlockOutputStream[replicationConfig.getRequiredNodes()];
for (int i = currentStreamIdx; i < replicationConfig
.getRequiredNodes(); i++) {
List<DatanodeDetails> nodes = getPipeline().getNodes();
blockOutputStreams[i] =
streams[i] =
new ECBlockOutputStream(getBlockID(), getXceiverClientManager(),
createSingleECBlockPipeline(getPipeline(), nodes.get(i), i + 1),
getBufferPool(), getConf(), getToken(), getClientMetrics());
}
blockOutputStreams = streams;
}
}

Expand Down
14 changes: 6 additions & 8 deletions ...p-ozone/client/src/test/java/org/apache/hadoop/ozone/client/MockXceiverClientFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,11 @@
import java.io.IOException;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;

/**
* Factory to create the mock datanode clients.
Expand All @@ -39,9 +38,9 @@ public class MockXceiverClientFactory
implements XceiverClientFactory {

private final Map<DatanodeDetails, MockDatanodeStorage> storage =
new HashMap<>();
new ConcurrentHashMap<>();
private final Map<IOException, Set<DatanodeDetails>> pendingDNFailures =
new HashMap<>();
new ConcurrentHashMap<>();

public void setFailedStorages(List<DatanodeDetails> failedStorages) {
mockStorageFailure(failedStorages,
Expand All @@ -50,10 +49,9 @@ public void setFailedStorages(List<DatanodeDetails> failedStorages) {

public void mockStorageFailure(Collection<DatanodeDetails> datanodes,
IOException reason) {
if (!pendingDNFailures.containsKey(reason)) {
pendingDNFailures.put(reason, new HashSet<>());
}
pendingDNFailures.get(reason).addAll(datanodes);
pendingDNFailures
.computeIfAbsent(reason, k -> ConcurrentHashMap.newKeySet())
.addAll(datanodes);
mockStorageFailure(reason);
}

Expand Down