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

HDDS-85. Send Container State Info while sending the container report from Datanode to SCM. Contributed by Shashikant Banerjee.

This commit is contained in:
Mukul Kumar Singh 2018-05-23 14:15:35 +05:30
parent 745f203e57
commit fed2bef647
7 changed files with 57 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hadoop-hdds/common/src/main/proto/DatanodeContainerProtocol.proto
View File

@ -131,6 +131,7 @@ enum Result {
UNCLOSED_CONTAINER_IO = 25;
DELETE_ON_OPEN_CONTAINER = 26;
CLOSED_CONTAINER_RETRY = 27;
INVALID_CONTAINER_STATE = 28;
}
/**

8
hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/helpers/ContainerData.java
View File

@ -339,6 +339,14 @@ public class ContainerData {
return !(ContainerLifeCycleState.INVALID == state);
}
/**
* checks if the container is closed.
* @return - boolean
*/
public synchronized boolean isClosed() {
return ContainerLifeCycleState.CLOSED == state;
}
/**
* Marks this container as closed.
*/

45
hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerManagerImpl.java
View File

@ -26,6 +26,8 @@ import org.apache.hadoop.hdds.scm.ScmConfigKeys;
import org.apache.hadoop.hdds.scm.container.common.helpers
.StorageContainerException;
import org.apache.hadoop.hdfs.server.datanode.StorageLocation;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos.LifeCycleState;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos
@ -100,6 +102,8 @@ import static org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos
.Result.UNCLOSED_CONTAINER_IO;
import static org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos
.Result.UNSUPPORTED_REQUEST;
import static org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.
Result.INVALID_CONTAINER_STATE;
import static org.apache.hadoop.ozone.OzoneConsts.CONTAINER_EXTENSION;
/**
@ -706,6 +710,39 @@ public class ContainerManagerImpl implements ContainerManager {
return containerData.isOpen();
}
/**
* Returns LifeCycle State of the container
* @param containerID - Id of the container
* @return LifeCycle State of the container
* @throws StorageContainerException
*/
private HddsProtos.LifeCycleState getState(long containerID)
throws StorageContainerException {
LifeCycleState state;
final ContainerData data = containerMap.get(containerID);
if (data == null) {
throw new StorageContainerException(
"Container status not found: " + containerID, CONTAINER_NOT_FOUND);
}
switch (data.getState()) {
case OPEN:
state = LifeCycleState.OPEN;
break;
case CLOSING:
state = LifeCycleState.CLOSING;
break;
case CLOSED:
state = LifeCycleState.CLOSED;
break;
default:
throw new StorageContainerException(
"Invalid Container state found: " + containerID,
INVALID_CONTAINER_STATE);
}
return state;
}
/**
* Supports clean shutdown of container.
*
@ -835,14 +872,14 @@ public class ContainerManagerImpl implements ContainerManager {
* @throws IOException
*/
@Override
public List<ContainerData> getContainerReports() throws IOException {
public List<ContainerData> getClosedContainerReports() throws IOException {
LOG.debug("Starting container report iteration.");
// No need for locking since containerMap is a ConcurrentSkipListMap
// And we can never get the exact state since close might happen
// after we iterate a point.
return containerMap.entrySet().stream()
.filter(containerData ->
!containerData.getValue().isOpen())
containerData.getValue().isClosed())
.map(containerData -> containerData.getValue())
.collect(Collectors.toList());
}
@ -870,6 +907,7 @@ public class ContainerManagerImpl implements ContainerManager {
.setType(ContainerReportsRequestProto.reportType.fullReport);
for (ContainerData container: containers) {
long containerId = container.getContainerID();
StorageContainerDatanodeProtocolProtos.ContainerInfo.Builder ciBuilder =
StorageContainerDatanodeProtocolProtos.ContainerInfo.newBuilder();
ciBuilder.setContainerID(container.getContainerID())
@ -879,7 +917,8 @@ public class ContainerManagerImpl implements ContainerManager {
.setReadCount(container.getReadCount())
.setWriteCount(container.getWriteCount())
.setReadBytes(container.getReadBytes())
.setWriteBytes(container.getWriteBytes());
.setWriteBytes(container.getWriteBytes())
.setState(getState(containerId));
crBuilder.addReports(ciBuilder.build());
}

2
hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/interfaces/ContainerManager.java
View File

@ -185,7 +185,7 @@ public interface ContainerManager extends RwLock {
* @return List of all closed containers.
* @throws IOException
*/
List<ContainerData> getContainerReports() throws IOException;
List<ContainerData> getClosedContainerReports() throws IOException;
/**
* Increase pending deletion blocks count number of specified container.

4
hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/ContainerReportHandler.java
View File

@ -63,13 +63,13 @@ public class ContainerReportHandler implements CommandHandler {
invocationCount++;
long startTime = Time.monotonicNow();
try {
ContainerReportsRequestProto contianerReport =
ContainerReportsRequestProto containerReport =
container.getContainerReport();
// TODO : We send this report to all SCMs.Check if it is enough only to
// send to the leader once we have RAFT enabled SCMs.
for (EndpointStateMachine endPoint : connectionManager.getValues()) {
endPoint.getEndPoint().sendContainerReport(contianerReport);
endPoint.getEndPoint().sendContainerReport(containerReport);
}
} catch (IOException ex) {
LOG.error("Unable to process the Container Report command.", ex);

4
hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/OzoneContainer.java
View File

@ -265,8 +265,8 @@ public class OzoneContainer {
* @return - List of closed containers.
* @throws IOException
*/
public List<ContainerData> getContainerReports() throws IOException {
return this.manager.getContainerReports();
public List<ContainerData> getClosedContainerReports() throws IOException {
return this.manager.getClosedContainerReports();
}
@VisibleForTesting

2
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestContainerPersistence.java
View File

@ -307,7 +307,7 @@ public class TestContainerPersistence {
}
// The container report only returns reports of closed containers.
List<ContainerData> reports = containerManager.getContainerReports();
List<ContainerData> reports = containerManager.getClosedContainerReports();
Assert.assertEquals(4, reports.size());
for(ContainerData report : reports) {
long actualContainerID = report.getContainerID();