big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HDDS-305. Datanode StateContext#addContainerActionIfAbsent will add container action even if there already is a ContainerAction. Contributed by Nanda kumar.

Browse Source
This commit is contained in:
Nanda kumar 2018-07-31 17:27:51 +05:30
parent 3e06a5dcea
commit 7631e0adae
3 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -168,19 +168,8 @@ private void sendCloseContainerActionIfNeeded(Container container) {
double containerUsedPercentage = 1.0f * containerData.getBytesUsed() / double containerUsedPercentage = 1.0f * containerData.getBytesUsed() /
StorageUnit.GB.toBytes(containerData.getMaxSizeGB()); StorageUnit.GB.toBytes(containerData.getMaxSizeGB());
if (containerUsedPercentage >= containerCloseThreshold) { if (containerUsedPercentage >= containerCloseThreshold) {
ContainerInfo containerInfo = ContainerInfo.newBuilder()
.setContainerID(containerData.getContainerID())
.setReadCount(containerData.getReadCount())
.setWriteCount(containerData.getWriteCount())
.setReadBytes(containerData.getReadBytes())
.setWriteBytes(containerData.getWriteBytes())
.setUsed(containerData.getBytesUsed())
.setState(HddsProtos.LifeCycleState.OPEN)
.build();
ContainerAction action = ContainerAction.newBuilder() ContainerAction action = ContainerAction.newBuilder()
.setContainer(containerInfo) .setContainerID(containerData.getContainerID())
.setAction(ContainerAction.Action.CLOSE) .setAction(ContainerAction.Action.CLOSE)
.setReason(ContainerAction.Reason.CONTAINER_FULL) .setReason(ContainerAction.Reason.CONTAINER_FULL)
.build(); .build();

2
hadoop-hdds/container-service/src/main/proto/StorageContainerDatanodeProtocol.proto
View File

@ -157,7 +157,7 @@ message ContainerAction {
CONTAINER_FULL = 1; CONTAINER_FULL = 1;
} }
required ContainerInfo container = 1; required int64 containerID = 1;
required Action action = 2; required Action action = 2;
optional Reason reason = 3; optional Reason reason = 3;
} }

5
hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/states/endpoint/TestHeartbeatEndpointTask.java
View File

@ -289,10 +289,7 @@ private HeartbeatEndpointTask getHeartbeatEndpointTask(
private ContainerAction getContainerAction() { private ContainerAction getContainerAction() {
ContainerAction.Builder builder = ContainerAction.newBuilder(); ContainerAction.Builder builder = ContainerAction.newBuilder();
ContainerInfo containerInfo = ContainerInfo.newBuilder() builder.setContainerID(1L)
.setContainerID(1L)
.build();
builder.setContainer(containerInfo)
.setAction(ContainerAction.Action.CLOSE) .setAction(ContainerAction.Action.CLOSE)
.setReason(ContainerAction.Reason.CONTAINER_FULL); .setReason(ContainerAction.Reason.CONTAINER_FULL);
return builder.build(); return builder.build();