Apache/hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDDS-721. NullPointerException thrown while trying to read a file when datanode restarted. Contributed by Shashikant Banerjee.

Browse Source
This commit is contained in:
Mukul Kumar Singh 2018-10-30 19:45:32 +05:30
parent da32f6537b
commit 5e48a70474
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientGrpc.java
View File

@ -84,7 +84,7 @@ public XceiverClientGrpc(Pipeline pipeline, Configuration config) {
public void connect() throws Exception { public void connect() throws Exception {
// leader by default is the 1st datanode in the datanode list of pipleline // leader by default is the 1st datanode in the datanode list of pipleline
DatanodeDetails leader = this.pipeline.getLeader(); DatanodeDetails leader = this.pipeline.getMachines().get(0);
// just make a connection to the 1st datanode at the beginning // just make a connection to the 1st datanode at the beginning
connectToDatanode(leader); connectToDatanode(leader);
} }
@ -201,7 +201,7 @@ public ContainerCommandResponseProto sendCommandWithRetry(
public CompletableFuture<ContainerCommandResponseProto> sendCommandAsync( public CompletableFuture<ContainerCommandResponseProto> sendCommandAsync(
ContainerCommandRequestProto request) ContainerCommandRequestProto request)
throws IOException, ExecutionException, InterruptedException { throws IOException, ExecutionException, InterruptedException {
return sendCommandAsync(request, pipeline.getLeader()); return sendCommandAsync(request, pipeline.getMachines().get(0));
} }
private CompletableFuture<ContainerCommandResponseProto> sendCommandAsync( private CompletableFuture<ContainerCommandResponseProto> sendCommandAsync(

4
hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/ChunkGroupInputStream.java
View File

@ -279,6 +279,10 @@ public static LengthInputStream getFromOmKeyInfo(
ContainerWithPipeline containerWithPipeline = ContainerWithPipeline containerWithPipeline =
storageContainerLocationClient.getContainerWithPipeline(containerID); storageContainerLocationClient.getContainerWithPipeline(containerID);
Pipeline pipeline = containerWithPipeline.getPipeline(); Pipeline pipeline = containerWithPipeline.getPipeline();
if (pipeline.getMachines().isEmpty()) {
throw new IOException(
"No datanodes found in the pipeline " + pipeline.getId());
}
// irrespective of the container state, we will always read via Standalone // irrespective of the container state, we will always read via Standalone
// protocol. // protocol.

8
hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/ChunkGroupOutputStream.java
View File

@ -24,6 +24,7 @@
import org.apache.hadoop.hdds.scm.container.common.helpers.ContainerInfo; import org.apache.hadoop.hdds.scm.container.common.helpers.ContainerInfo;
import org.apache.hadoop.hdds.client.BlockID; import org.apache.hadoop.hdds.client.BlockID;
import org.apache.hadoop.hdds.scm.container.common.helpers.ContainerWithPipeline; import org.apache.hadoop.hdds.scm.container.common.helpers.ContainerWithPipeline;
import org.apache.hadoop.hdds.scm.container.common.helpers.Pipeline;
import org.apache.hadoop.io.retry.RetryPolicy; import org.apache.hadoop.io.retry.RetryPolicy;
import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfoGroup; import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfoGroup;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationType; import org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationType;
@ -191,9 +192,14 @@ private void checkKeyLocationInfo(OmKeyLocationInfo subKeyInfo)
ContainerWithPipeline containerWithPipeline = scmClient ContainerWithPipeline containerWithPipeline = scmClient
.getContainerWithPipeline(subKeyInfo.getContainerID()); .getContainerWithPipeline(subKeyInfo.getContainerID());
ContainerInfo container = containerWithPipeline.getContainerInfo(); ContainerInfo container = containerWithPipeline.getContainerInfo();
Pipeline pipeline = containerWithPipeline.getPipeline();
if (pipeline.getMachines().isEmpty()) {
throw new IOException(
"No datanodes found in the pipeline " + pipeline.getId());
}
XceiverClientSpi xceiverClient = XceiverClientSpi xceiverClient =
xceiverClientManager.acquireClient(containerWithPipeline.getPipeline()); xceiverClientManager.acquireClient(pipeline);
// create container if needed // create container if needed
if (subKeyInfo.getShouldCreateContainer()) { if (subKeyInfo.getShouldCreateContainer()) {
try { try {