HDDS-305. Datanode StateContext#addContainerActionIfAbsent will add container action even if there already is a ContainerAction. Contributed by Nanda kumar.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7631e0ad Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7631e0ad Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7631e0ad Branch: refs/heads/HDFS-12943 Commit: 7631e0adaefcccdbee693089b4c391bea4107a19 Parents: 3e06a5d Author: Nanda kumar <na...@apache.org> Authored: Tue Jul 31 17:27:51 2018 +0530 Committer: Nanda kumar <na...@apache.org> Committed: Tue Jul 31 17:27:51 2018 +0530 ---------------------------------------------------------------------- .../ozone/container/common/impl/HddsDispatcher.java | 13 +------------ .../main/proto/StorageContainerDatanodeProtocol.proto | 2 +- .../states/endpoint/TestHeartbeatEndpointTask.java | 5 +---- 3 files changed, 3 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/7631e0ad/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/HddsDispatcher.java ---------------------------------------------------------------------- diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/HddsDispatcher.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/HddsDispatcher.java index ee232db..d92eb17 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/HddsDispatcher.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/HddsDispatcher.java @@ -168,19 +168,8 @@ public class HddsDispatcher implements ContainerDispatcher { double containerUsedPercentage = 1.0f * containerData.getBytesUsed() / StorageUnit.GB.toBytes(containerData.getMaxSizeGB()); 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() - .setContainer(containerInfo) + .setContainerID(containerData.getContainerID()) .setAction(ContainerAction.Action.CLOSE) .setReason(ContainerAction.Reason.CONTAINER_FULL) .build(); http://git-wip-us.apache.org/repos/asf/hadoop/blob/7631e0ad/hadoop-hdds/container-service/src/main/proto/StorageContainerDatanodeProtocol.proto ---------------------------------------------------------------------- diff --git a/hadoop-hdds/container-service/src/main/proto/StorageContainerDatanodeProtocol.proto b/hadoop-hdds/container-service/src/main/proto/StorageContainerDatanodeProtocol.proto index 0c52efb..71c41e3 100644 --- a/hadoop-hdds/container-service/src/main/proto/StorageContainerDatanodeProtocol.proto +++ b/hadoop-hdds/container-service/src/main/proto/StorageContainerDatanodeProtocol.proto @@ -157,7 +157,7 @@ message ContainerAction { CONTAINER_FULL = 1; } - required ContainerInfo container = 1; + required int64 containerID = 1; required Action action = 2; optional Reason reason = 3; } http://git-wip-us.apache.org/repos/asf/hadoop/blob/7631e0ad/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/states/endpoint/TestHeartbeatEndpointTask.java ---------------------------------------------------------------------- diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/states/endpoint/TestHeartbeatEndpointTask.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/states/endpoint/TestHeartbeatEndpointTask.java index b4d718d..13de11f 100644 --- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/states/endpoint/TestHeartbeatEndpointTask.java +++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/states/endpoint/TestHeartbeatEndpointTask.java @@ -289,10 +289,7 @@ public class TestHeartbeatEndpointTask { private ContainerAction getContainerAction() { ContainerAction.Builder builder = ContainerAction.newBuilder(); - ContainerInfo containerInfo = ContainerInfo.newBuilder() - .setContainerID(1L) - .build(); - builder.setContainer(containerInfo) + builder.setContainerID(1L) .setAction(ContainerAction.Action.CLOSE) .setReason(ContainerAction.Reason.CONTAINER_FULL); return builder.build(); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
