You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by na...@apache.org on 2018/10/03 09:57:22 UTC
[1/5] hadoop git commit: HDDS-401. Update storage statistics on dead
node. Contributed by LiXin Ge.
Repository: hadoop
Updated Branches:
refs/heads/ozone-0.2 1cc129bb7 -> f4009aefc
HDDS-401. Update storage statistics on dead node. Contributed by LiXin Ge.
(cherry picked from commit 184544eff8b3d5951e4f04d080fa00de8e1eec95)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/50504f37
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/50504f37
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/50504f37
Branch: refs/heads/ozone-0.2
Commit: 50504f370b09fad18893968d199601a2876fbfdd
Parents: 1cc129b
Author: Ajay Kumar <aj...@apache.com>
Authored: Thu Sep 27 09:56:30 2018 -0700
Committer: Nanda kumar <na...@apache.org>
Committed: Wed Oct 3 15:20:58 2018 +0530
----------------------------------------------------------------------
.../hadoop/hdds/scm/node/DeadNodeHandler.java | 7 +-
.../hadoop/hdds/scm/node/NodeManager.java | 7 ++
.../hadoop/hdds/scm/node/SCMNodeManager.java | 16 +++
.../scm/server/StorageContainerManager.java | 2 +-
.../hdds/scm/container/MockNodeManager.java | 15 +++
.../hdds/scm/node/TestDeadNodeHandler.java | 109 ++++++++++++++++---
.../testutils/ReplicationNodeManagerMock.java | 9 ++
7 files changed, 145 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/50504f37/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/DeadNodeHandler.java
----------------------------------------------------------------------
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/DeadNodeHandler.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/DeadNodeHandler.java
index 7fda67d..88f5df7 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/DeadNodeHandler.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/DeadNodeHandler.java
@@ -42,19 +42,24 @@ public class DeadNodeHandler implements EventHandler<DatanodeDetails> {
private final ContainerStateManager containerStateManager;
+ private final NodeManager nodeManager;
+
private static final Logger LOG =
LoggerFactory.getLogger(DeadNodeHandler.class);
public DeadNodeHandler(
Node2ContainerMap node2ContainerMap,
- ContainerStateManager containerStateManager) {
+ ContainerStateManager containerStateManager, NodeManager nodeManager) {
this.node2ContainerMap = node2ContainerMap;
this.containerStateManager = containerStateManager;
+ this.nodeManager = nodeManager;
}
@Override
public void onMessage(DatanodeDetails datanodeDetails,
EventPublisher publisher) {
+ nodeManager.processDeadNode(datanodeDetails.getUuid());
+
Set<ContainerID> containers =
node2ContainerMap.getContainers(datanodeDetails.getUuid());
if (containers == null) {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/50504f37/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeManager.java
----------------------------------------------------------------------
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeManager.java
index deb1628..fc73253 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeManager.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeManager.java
@@ -147,4 +147,11 @@ public interface NodeManager extends StorageContainerNodeProtocol,
* @param nodeReport
*/
void processNodeReport(UUID dnUuid, NodeReportProto nodeReport);
+
+ /**
+ * Process a dead node event in this Node Manager.
+ *
+ * @param dnUuid datanode uuid.
+ */
+ void processDeadNode(UUID dnUuid);
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/50504f37/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java
----------------------------------------------------------------------
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java
index 58da1cc..fd5f5de 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java
@@ -490,4 +490,20 @@ public class SCMNodeManager
addDatanodeCommand(commandForDatanode.getDatanodeId(),
commandForDatanode.getCommand());
}
+
+ /**
+ * Remove the node stats and update the storage stats
+ * in this SCM Node Manager.
+ *
+ * @param dnUuid datanode uuid.
+ */
+ @Override
+ public void processDeadNode(UUID dnUuid) {
+ SCMNodeStat stat = nodeStats.get(dnUuid);
+ LOG.trace("Update stat values as Datanode {} is dead.", dnUuid);
+ if (stat != null) {
+ scmStat.subtract(stat);
+ stat.set(0, 0, 0);
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/50504f37/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
----------------------------------------------------------------------
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
index 6ddec4c..bb72075 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
@@ -231,7 +231,7 @@ public final class StorageContainerManager extends ServiceRuntimeInfoImpl
new StaleNodeHandler(node2ContainerMap,
scmContainerManager.getPipelineSelector());
DeadNodeHandler deadNodeHandler = new DeadNodeHandler(node2ContainerMap,
- getScmContainerManager().getStateManager());
+ getScmContainerManager().getStateManager(), scmNodeManager);
ContainerActionsHandler actionsHandler = new ContainerActionsHandler();
PendingDeleteHandler pendingDeleteHandler =
new PendingDeleteHandler(scmBlockManager.getSCMBlockDeletingService());
http://git-wip-us.apache.org/repos/asf/hadoop/blob/50504f37/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java
----------------------------------------------------------------------
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java
index 21e44a3..5173b23 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java
@@ -422,6 +422,21 @@ public class MockNodeManager implements NodeManager {
}
/**
+ * Remove the node stats and update the storage stats
+ * in this Node Manager.
+ *
+ * @param dnUuid UUID of the datanode.
+ */
+ @Override
+ public void processDeadNode(UUID dnUuid) {
+ SCMNodeStat stat = this.nodeMetricMap.get(dnUuid);
+ if (stat != null) {
+ aggregateStat.subtract(stat);
+ stat.set(0, 0, 0);
+ }
+ }
+
+ /**
* A class to declare some values for the nodes so that our tests
* won't fail.
*/
http://git-wip-us.apache.org/repos/asf/hadoop/blob/50504f37/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestDeadNodeHandler.java
----------------------------------------------------------------------
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestDeadNodeHandler.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestDeadNodeHandler.java
index 5ca9cb7..698332e 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestDeadNodeHandler.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestDeadNodeHandler.java
@@ -27,19 +27,27 @@ import java.util.stream.Collectors;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
+import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.NodeReportProto;
+import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.StorageReportProto;
import org.apache.hadoop.hdds.scm.TestUtils;
import org.apache.hadoop.hdds.scm.container.ContainerID;
import org.apache.hadoop.hdds.scm.container.ContainerStateManager;
import org.apache.hadoop.hdds.scm.container.Mapping;
import org.apache.hadoop.hdds.scm.container.common.helpers.ContainerInfo;
+import org.apache.hadoop.hdds.scm.container.placement.metrics.SCMNodeMetric;
import org.apache.hadoop.hdds.scm.container.replication.ReplicationRequest;
import org.apache.hadoop.hdds.scm.events.SCMEvents;
+import org.apache.hadoop.hdds.scm.container.placement.metrics.SCMNodeStat;
import org.apache.hadoop.hdds.scm.exceptions.SCMException;
import org.apache.hadoop.hdds.scm.node.states.Node2ContainerMap;
import org.apache.hadoop.hdds.scm.pipelines.PipelineSelector;
+import org.apache.hadoop.hdds.scm.server.SCMDatanodeHeartbeatDispatcher.NodeReportFromDatanode;
import org.apache.hadoop.hdds.server.events.EventPublisher;
+import org.apache.hadoop.hdds.server.events.EventQueue;
+import org.apache.hadoop.test.GenericTestUtils;
import org.junit.Assert;
+import org.junit.Before;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
import static org.mockito.Matchers.eq;
@@ -51,6 +59,29 @@ import org.mockito.Mockito;
public class TestDeadNodeHandler {
private List<ReplicationRequest> sentEvents = new ArrayList<>();
+ private SCMNodeManager nodeManager;
+ private Node2ContainerMap node2ContainerMap;
+ private ContainerStateManager containerStateManager;
+ private NodeReportHandler nodeReportHandler;
+ private DeadNodeHandler deadNodeHandler;
+ private EventPublisher publisher;
+ private EventQueue eventQueue;
+
+ @Before
+ public void setup() throws IOException {
+ OzoneConfiguration conf = new OzoneConfiguration();
+ node2ContainerMap = new Node2ContainerMap();
+ containerStateManager = new ContainerStateManager(conf,
+ Mockito.mock(Mapping.class),
+ Mockito.mock(PipelineSelector.class));
+ eventQueue = new EventQueue();
+ nodeManager = new SCMNodeManager(conf, "cluster1", null, eventQueue);
+ deadNodeHandler = new DeadNodeHandler(node2ContainerMap,
+ containerStateManager, nodeManager);
+ eventQueue.addHandler(SCMEvents.DEAD_NODE, deadNodeHandler);
+ publisher = Mockito.mock(EventPublisher.class);
+ nodeReportHandler = new NodeReportHandler(nodeManager);
+ }
@Test
public void testOnMessage() throws IOException {
@@ -58,13 +89,6 @@ public class TestDeadNodeHandler {
DatanodeDetails datanode1 = TestUtils.randomDatanodeDetails();
DatanodeDetails datanode2 = TestUtils.randomDatanodeDetails();
- Node2ContainerMap node2ContainerMap = new Node2ContainerMap();
- ContainerStateManager containerStateManager = new ContainerStateManager(
- new OzoneConfiguration(),
- Mockito.mock(Mapping.class),
- Mockito.mock(PipelineSelector.class)
- );
-
ContainerInfo container1 =
TestUtils.allocateContainer(containerStateManager);
ContainerInfo container2 =
@@ -72,9 +96,6 @@ public class TestDeadNodeHandler {
ContainerInfo container3 =
TestUtils.allocateContainer(containerStateManager);
- DeadNodeHandler handler =
- new DeadNodeHandler(node2ContainerMap, containerStateManager);
-
registerReplicas(node2ContainerMap, datanode1, container1, container2);
registerReplicas(node2ContainerMap, datanode2, container1, container3);
@@ -84,10 +105,8 @@ public class TestDeadNodeHandler {
TestUtils.closeContainer(containerStateManager, container1);
- EventPublisher publisher = Mockito.mock(EventPublisher.class);
-
//WHEN datanode1 is dead
- handler.onMessage(datanode1, publisher);
+ deadNodeHandler.onMessage(datanode1, publisher);
//THEN
//node2ContainerMap has not been changed
@@ -128,22 +147,76 @@ public class TestDeadNodeHandler {
replicationRequestParameter.getValue().getExpecReplicationCount());
}
- private void registerReplicas(ContainerStateManager containerStateManager,
+ @Test
+ public void testStatisticsUpdate() throws Exception {
+ //GIVEN
+ DatanodeDetails datanode1 = TestUtils.randomDatanodeDetails();
+ DatanodeDetails datanode2 = TestUtils.randomDatanodeDetails();
+ String storagePath1 = GenericTestUtils.getRandomizedTempPath()
+ .concat("/" + datanode1.getUuidString());
+ String storagePath2 = GenericTestUtils.getRandomizedTempPath()
+ .concat("/" + datanode2.getUuidString());
+
+ StorageReportProto storageOne = TestUtils.createStorageReport(
+ datanode1.getUuid(), storagePath1, 100, 10, 90, null);
+ StorageReportProto storageTwo = TestUtils.createStorageReport(
+ datanode2.getUuid(), storagePath2, 200, 20, 180, null);
+ nodeReportHandler.onMessage(getNodeReport(datanode1, storageOne),
+ Mockito.mock(EventPublisher.class));
+ nodeReportHandler.onMessage(getNodeReport(datanode2, storageTwo),
+ Mockito.mock(EventPublisher.class));
+
+ ContainerInfo container1 =
+ TestUtils.allocateContainer(containerStateManager);
+ registerReplicas(node2ContainerMap, datanode1, container1);
+
+ SCMNodeStat stat = nodeManager.getStats();
+ Assert.assertTrue(stat.getCapacity().get() == 300);
+ Assert.assertTrue(stat.getRemaining().get() == 270);
+ Assert.assertTrue(stat.getScmUsed().get() == 30);
+
+ SCMNodeMetric nodeStat = nodeManager.getNodeStat(datanode1);
+ Assert.assertTrue(nodeStat.get().getCapacity().get() == 100);
+ Assert.assertTrue(nodeStat.get().getRemaining().get() == 90);
+ Assert.assertTrue(nodeStat.get().getScmUsed().get() == 10);
+
+ //WHEN datanode1 is dead.
+ eventQueue.fireEvent(SCMEvents.DEAD_NODE, datanode1);
+ Thread.sleep(100);
+
+ //THEN statistics in SCM should changed.
+ stat = nodeManager.getStats();
+ Assert.assertTrue(stat.getCapacity().get() == 200);
+ Assert.assertTrue(stat.getRemaining().get() == 180);
+ Assert.assertTrue(stat.getScmUsed().get() == 20);
+
+ nodeStat = nodeManager.getNodeStat(datanode1);
+ Assert.assertTrue(nodeStat.get().getCapacity().get() == 0);
+ Assert.assertTrue(nodeStat.get().getRemaining().get() == 0);
+ Assert.assertTrue(nodeStat.get().getScmUsed().get() == 0);
+ }
+
+ private void registerReplicas(ContainerStateManager csm,
ContainerInfo container, DatanodeDetails... datanodes) {
- containerStateManager.getContainerStateMap()
+ csm.getContainerStateMap()
.addContainerReplica(new ContainerID(container.getContainerID()),
datanodes);
}
- private void registerReplicas(Node2ContainerMap node2ContainerMap,
+ private void registerReplicas(Node2ContainerMap node2ConMap,
DatanodeDetails datanode,
ContainerInfo... containers)
throws SCMException {
- node2ContainerMap
+ node2ConMap
.insertNewDatanode(datanode.getUuid(),
Arrays.stream(containers)
.map(container -> new ContainerID(container.getContainerID()))
.collect(Collectors.toSet()));
}
-}
\ No newline at end of file
+ private NodeReportFromDatanode getNodeReport(DatanodeDetails dn,
+ StorageReportProto... reports) {
+ NodeReportProto nodeReportProto = TestUtils.createNodeReport(reports);
+ return new NodeReportFromDatanode(dn, nodeReportProto);
+ }
+}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/50504f37/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/container/testutils/ReplicationNodeManagerMock.java
----------------------------------------------------------------------
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/container/testutils/ReplicationNodeManagerMock.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/container/testutils/ReplicationNodeManagerMock.java
index e8a6892..4238703 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/container/testutils/ReplicationNodeManagerMock.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/container/testutils/ReplicationNodeManagerMock.java
@@ -307,4 +307,13 @@ public class ReplicationNodeManagerMock implements NodeManager {
EventPublisher publisher) {
// do nothing.
}
+
+ /**
+ * Empty implementation for processDeadNode.
+ * @param dnUuid
+ */
+ @Override
+ public void processDeadNode(UUID dnUuid) {
+ // do nothing.
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[4/5] hadoop git commit: HDDS-561. Move Node2ContainerMap and
Node2PipelineMap to NodeManager. Contributed by Lokesh Jain.
Posted by na...@apache.org.
HDDS-561. Move Node2ContainerMap and Node2PipelineMap to NodeManager. Contributed by Lokesh Jain.
(cherry picked from commit a39296260f8c77f3808e27b43c623a0edebe4a17)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0541d763
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0541d763
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0541d763
Branch: refs/heads/ozone-0.2
Commit: 0541d7630926cfebdca0c45aa7aabd3097a5ec8b
Parents: 7156635
Author: Nanda kumar <na...@apache.org>
Authored: Tue Oct 2 19:47:15 2018 +0530
Committer: Nanda kumar <na...@apache.org>
Committed: Wed Oct 3 15:26:33 2018 +0530
----------------------------------------------------------------------
.../scm/container/ContainerReportHandler.java | 16 ++--
.../hadoop/hdds/scm/node/DeadNodeHandler.java | 11 +--
.../hadoop/hdds/scm/node/NewNodeHandler.java | 9 +-
.../hadoop/hdds/scm/node/NodeManager.java | 61 ++++++++++++++
.../hadoop/hdds/scm/node/NodeStateManager.java | 88 +++++++++++++++++++-
.../hadoop/hdds/scm/node/SCMNodeManager.java | 83 ++++++++++++++++++
.../hdds/scm/node/SCMNodeStorageStatMap.java | 2 +-
.../hadoop/hdds/scm/node/StaleNodeHandler.java | 9 +-
.../hdds/scm/node/states/Node2ContainerMap.java | 2 +-
.../hdds/scm/node/states/Node2PipelineMap.java | 75 +++++++++++++++++
.../hdds/scm/pipelines/Node2PipelineMap.java | 75 -----------------
.../hdds/scm/pipelines/PipelineSelector.java | 18 ++--
.../scm/server/StorageContainerManager.java | 14 ++--
.../hdds/scm/container/MockNodeManager.java | 87 +++++++++++++++++++
.../container/TestContainerReportHandler.java | 14 ++--
.../hdds/scm/node/TestDeadNodeHandler.java | 27 ++----
.../testutils/ReplicationNodeManagerMock.java | 82 ++++++++++++++++++
.../hdds/scm/pipeline/TestNode2PipelineMap.java | 2 +-
.../hdds/scm/pipeline/TestPipelineClose.java | 2 +-
19 files changed, 520 insertions(+), 157 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0541d763/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/ContainerReportHandler.java
----------------------------------------------------------------------
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/ContainerReportHandler.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/ContainerReportHandler.java
index 3f156de..71935f0 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/ContainerReportHandler.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/ContainerReportHandler.java
@@ -29,7 +29,7 @@ import org.apache.hadoop.hdds.scm.container.replication.ReplicationActivityStatu
import org.apache.hadoop.hdds.scm.container.replication.ReplicationRequest;
import org.apache.hadoop.hdds.scm.events.SCMEvents;
import org.apache.hadoop.hdds.scm.exceptions.SCMException;
-import org.apache.hadoop.hdds.scm.node.states.Node2ContainerMap;
+import org.apache.hadoop.hdds.scm.node.NodeManager;
import org.apache.hadoop.hdds.scm.node.states.ReportResult;
import org.apache.hadoop.hdds.scm.server.SCMDatanodeHeartbeatDispatcher.ContainerReportFromDatanode;
import org.apache.hadoop.hdds.server.events.EventHandler;
@@ -48,7 +48,7 @@ public class ContainerReportHandler implements
private static final Logger LOG =
LoggerFactory.getLogger(ContainerReportHandler.class);
- private final Node2ContainerMap node2ContainerMap;
+ private final NodeManager nodeManager;
private final Mapping containerMapping;
@@ -57,14 +57,14 @@ public class ContainerReportHandler implements
private ReplicationActivityStatus replicationStatus;
public ContainerReportHandler(Mapping containerMapping,
- Node2ContainerMap node2ContainerMap,
+ NodeManager nodeManager,
ReplicationActivityStatus replicationActivityStatus) {
Preconditions.checkNotNull(containerMapping);
- Preconditions.checkNotNull(node2ContainerMap);
+ Preconditions.checkNotNull(nodeManager);
Preconditions.checkNotNull(replicationActivityStatus);
this.containerStateManager = containerMapping.getStateManager();
+ this.nodeManager = nodeManager;
this.containerMapping = containerMapping;
- this.node2ContainerMap = node2ContainerMap;
this.replicationStatus = replicationActivityStatus;
}
@@ -89,11 +89,11 @@ public class ContainerReportHandler implements
.map(ContainerID::new)
.collect(Collectors.toSet());
- ReportResult<ContainerID> reportResult = node2ContainerMap
- .processReport(datanodeOrigin.getUuid(), containerIds);
+ ReportResult<ContainerID> reportResult = nodeManager
+ .processContainerReport(datanodeOrigin.getUuid(), containerIds);
//we have the report, so we can update the states for the next iteration.
- node2ContainerMap
+ nodeManager
.setContainersForDatanode(datanodeOrigin.getUuid(), containerIds);
for (ContainerID containerID : reportResult.getMissingEntries()) {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0541d763/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/DeadNodeHandler.java
----------------------------------------------------------------------
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/DeadNodeHandler.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/DeadNodeHandler.java
index 253b3ec..17edf9e 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/DeadNodeHandler.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/DeadNodeHandler.java
@@ -26,7 +26,6 @@ import org.apache.hadoop.hdds.scm.container.ContainerStateManager;
import org.apache.hadoop.hdds.scm.container.replication.ReplicationRequest;
import org.apache.hadoop.hdds.scm.events.SCMEvents;
import org.apache.hadoop.hdds.scm.exceptions.SCMException;
-import org.apache.hadoop.hdds.scm.node.states.Node2ContainerMap;
import org.apache.hadoop.hdds.server.events.EventHandler;
import org.apache.hadoop.hdds.server.events.EventPublisher;
@@ -38,8 +37,6 @@ import org.slf4j.LoggerFactory;
*/
public class DeadNodeHandler implements EventHandler<DatanodeDetails> {
- private final Node2ContainerMap node2ContainerMap;
-
private final ContainerStateManager containerStateManager;
private final NodeManager nodeManager;
@@ -47,10 +44,8 @@ public class DeadNodeHandler implements EventHandler<DatanodeDetails> {
private static final Logger LOG =
LoggerFactory.getLogger(DeadNodeHandler.class);
- public DeadNodeHandler(
- Node2ContainerMap node2ContainerMap,
- ContainerStateManager containerStateManager, NodeManager nodeManager) {
- this.node2ContainerMap = node2ContainerMap;
+ public DeadNodeHandler(NodeManager nodeManager,
+ ContainerStateManager containerStateManager) {
this.containerStateManager = containerStateManager;
this.nodeManager = nodeManager;
}
@@ -61,7 +56,7 @@ public class DeadNodeHandler implements EventHandler<DatanodeDetails> {
nodeManager.processDeadNode(datanodeDetails.getUuid());
Set<ContainerID> containers =
- node2ContainerMap.getContainers(datanodeDetails.getUuid());
+ nodeManager.getContainers(datanodeDetails.getUuid());
if (containers == null) {
LOG.info("There's no containers in dead datanode {}, no replica will be"
+ " removed from the in-memory state.", datanodeDetails.getUuid());
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0541d763/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NewNodeHandler.java
----------------------------------------------------------------------
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NewNodeHandler.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NewNodeHandler.java
index 79b75a5..780aa2b 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NewNodeHandler.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NewNodeHandler.java
@@ -20,7 +20,6 @@ package org.apache.hadoop.hdds.scm.node;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
import org.apache.hadoop.hdds.scm.exceptions.SCMException;
-import org.apache.hadoop.hdds.scm.node.states.Node2ContainerMap;
import org.apache.hadoop.hdds.server.events.EventHandler;
import org.apache.hadoop.hdds.server.events.EventPublisher;
@@ -31,17 +30,17 @@ import java.util.Collections;
*/
public class NewNodeHandler implements EventHandler<DatanodeDetails> {
- private final Node2ContainerMap node2ContainerMap;
+ private final NodeManager nodeManager;
- public NewNodeHandler(Node2ContainerMap node2ContainerMap) {
- this.node2ContainerMap = node2ContainerMap;
+ public NewNodeHandler(NodeManager nodeManager) {
+ this.nodeManager = nodeManager;
}
@Override
public void onMessage(DatanodeDetails datanodeDetails,
EventPublisher publisher) {
try {
- node2ContainerMap.insertNewDatanode(datanodeDetails.getUuid(),
+ nodeManager.addDatanodeInContainerMap(datanodeDetails.getUuid(),
Collections.emptySet());
} catch (SCMException e) {
// TODO: log exception message.
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0541d763/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeManager.java
----------------------------------------------------------------------
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeManager.java
index fad3ee3..0dc1a0c 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeManager.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeManager.java
@@ -18,11 +18,16 @@
package org.apache.hadoop.hdds.scm.node;
import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.NodeReportProto;
+import org.apache.hadoop.hdds.scm.container.ContainerID;
+import org.apache.hadoop.hdds.scm.container.common.helpers.Pipeline;
+import org.apache.hadoop.hdds.scm.container.common.helpers.PipelineID;
import org.apache.hadoop.hdds.scm.container.placement.metrics.SCMNodeMetric;
import org.apache.hadoop.hdds.scm.container.placement.metrics.SCMNodeStat;
+import org.apache.hadoop.hdds.scm.exceptions.SCMException;
import org.apache.hadoop.hdds.scm.node.states.NodeNotFoundException;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos.NodeState;
+import org.apache.hadoop.hdds.scm.node.states.ReportResult;
import org.apache.hadoop.hdds.server.events.EventHandler;
import org.apache.hadoop.ozone.protocol.StorageContainerNodeProtocol;
import org.apache.hadoop.ozone.protocol.commands.CommandForDatanode;
@@ -31,6 +36,7 @@ import org.apache.hadoop.ozone.protocol.commands.SCMCommand;
import java.io.Closeable;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.UUID;
/**
@@ -134,6 +140,61 @@ public interface NodeManager extends StorageContainerNodeProtocol,
NodeState getNodeState(DatanodeDetails datanodeDetails);
/**
+ * Get set of pipelines a datanode is part of.
+ * @param dnId - datanodeID
+ * @return Set of PipelineID
+ */
+ Set<PipelineID> getPipelineByDnID(UUID dnId);
+
+ /**
+ * Add pipeline information in the NodeManager.
+ * @param pipeline - Pipeline to be added
+ */
+ void addPipeline(Pipeline pipeline);
+
+ /**
+ * Remove a pipeline information from the NodeManager.
+ * @param pipeline - Pipeline to be removed
+ */
+ void removePipeline(Pipeline pipeline);
+
+ /**
+ * Update set of containers available on a datanode.
+ * @param uuid - DatanodeID
+ * @param containerIds - Set of containerIDs
+ * @throws SCMException - if datanode is not known. For new datanode use
+ * addDatanodeInContainerMap call.
+ */
+ void setContainersForDatanode(UUID uuid, Set<ContainerID> containerIds)
+ throws SCMException;
+
+ /**
+ * Process containerReport received from datanode.
+ * @param uuid - DataonodeID
+ * @param containerIds - Set of containerIDs
+ * @return The result after processing containerReport
+ */
+ ReportResult<ContainerID> processContainerReport(UUID uuid,
+ Set<ContainerID> containerIds);
+
+ /**
+ * Return set of containerIDs available on a datanode.
+ * @param uuid - DatanodeID
+ * @return - set of containerIDs
+ */
+ Set<ContainerID> getContainers(UUID uuid);
+
+ /**
+ * Insert a new datanode with set of containerIDs for containers available
+ * on it.
+ * @param uuid - DatanodeID
+ * @param containerIDs - Set of ContainerIDs
+ * @throws SCMException - if datanode already exists
+ */
+ void addDatanodeInContainerMap(UUID uuid, Set<ContainerID> containerIDs)
+ throws SCMException;
+
+ /**
* Add a {@link SCMCommand} to the command queue, which are
* handled by HB thread asynchronously.
* @param dnId datanode uuid
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0541d763/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeStateManager.java
----------------------------------------------------------------------
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeStateManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeStateManager.java
index 1f99ffe..88f984b 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeStateManager.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeStateManager.java
@@ -24,11 +24,14 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos.NodeState;
import org.apache.hadoop.hdds.scm.HddsServerUtil;
+import org.apache.hadoop.hdds.scm.container.ContainerID;
+import org.apache.hadoop.hdds.scm.container.common.helpers.Pipeline;
+import org.apache.hadoop.hdds.scm.container.common.helpers.PipelineID;
import org.apache.hadoop.hdds.scm.container.placement.metrics.SCMNodeStat;
import org.apache.hadoop.hdds.scm.events.SCMEvents;
-import org.apache.hadoop.hdds.scm.node.states.NodeAlreadyExistsException;
-import org.apache.hadoop.hdds.scm.node.states.NodeNotFoundException;
-import org.apache.hadoop.hdds.scm.node.states.NodeStateMap;
+import org.apache.hadoop.hdds.scm.exceptions.SCMException;
+import org.apache.hadoop.hdds.scm.node.states.*;
+import org.apache.hadoop.hdds.scm.node.states.Node2PipelineMap;
import org.apache.hadoop.hdds.server.events.Event;
import org.apache.hadoop.hdds.server.events.EventPublisher;
import org.apache.hadoop.ozone.common.statemachine
@@ -87,6 +90,15 @@ public class NodeStateManager implements Runnable, Closeable {
*/
private final NodeStateMap nodeStateMap;
/**
+ * Maintains the mapping from node to pipelines a node is part of.
+ */
+ private final Node2PipelineMap node2PipelineMap;
+ /**
+ * Maintains the map from node to ContainerIDs for the containers
+ * available on the node.
+ */
+ private final Node2ContainerMap node2ContainerMap;
+ /**
* Used for publishing node state change events.
*/
private final EventPublisher eventPublisher;
@@ -118,6 +130,8 @@ public class NodeStateManager implements Runnable, Closeable {
*/
public NodeStateManager(Configuration conf, EventPublisher eventPublisher) {
this.nodeStateMap = new NodeStateMap();
+ this.node2PipelineMap = new Node2PipelineMap();
+ this.node2ContainerMap = new Node2ContainerMap();
this.eventPublisher = eventPublisher;
this.state2EventMap = new HashMap<>();
initialiseState2EventMap();
@@ -243,6 +257,14 @@ public class NodeStateManager implements Runnable, Closeable {
}
/**
+ * Adds a pipeline in the node2PipelineMap.
+ * @param pipeline - Pipeline to be added
+ */
+ public void addPipeline(Pipeline pipeline) {
+ node2PipelineMap.addPipeline(pipeline);
+ }
+
+ /**
* Get information about the node.
*
* @param datanodeDetails DatanodeDetails
@@ -353,6 +375,15 @@ public class NodeStateManager implements Runnable, Closeable {
}
/**
+ * Gets set of pipelineID a datanode belongs to.
+ * @param dnId - Datanode ID
+ * @return Set of PipelineID
+ */
+ public Set<PipelineID> getPipelineByDnID(UUID dnId) {
+ return node2PipelineMap.getPipelines(dnId);
+ }
+
+ /**
* Returns the count of healthy nodes.
*
* @return healthy node count
@@ -457,6 +488,57 @@ public class NodeStateManager implements Runnable, Closeable {
}
/**
+ * Removes a pipeline from the node2PipelineMap.
+ * @param pipeline - Pipeline to be removed
+ */
+ public void removePipeline(Pipeline pipeline) {
+ node2PipelineMap.removePipeline(pipeline);
+ }
+ /**
+ * Update set of containers available on a datanode.
+ * @param uuid - DatanodeID
+ * @param containerIds - Set of containerIDs
+ * @throws SCMException - if datanode is not known. For new datanode use
+ * addDatanodeInContainerMap call.
+ */
+ public void setContainersForDatanode(UUID uuid, Set<ContainerID> containerIds)
+ throws SCMException {
+ node2ContainerMap.setContainersForDatanode(uuid, containerIds);
+ }
+
+ /**
+ * Process containerReport received from datanode.
+ * @param uuid - DataonodeID
+ * @param containerIds - Set of containerIDs
+ * @return The result after processing containerReport
+ */
+ public ReportResult<ContainerID> processContainerReport(UUID uuid,
+ Set<ContainerID> containerIds) {
+ return node2ContainerMap.processReport(uuid, containerIds);
+ }
+
+ /**
+ * Return set of containerIDs available on a datanode.
+ * @param uuid - DatanodeID
+ * @return - set of containerIDs
+ */
+ public Set<ContainerID> getContainers(UUID uuid) {
+ return node2ContainerMap.getContainers(uuid);
+ }
+
+ /**
+ * Insert a new datanode with set of containerIDs for containers available
+ * on it.
+ * @param uuid - DatanodeID
+ * @param containerIDs - Set of ContainerIDs
+ * @throws SCMException - if datanode already exists
+ */
+ public void addDatanodeInContainerMap(UUID uuid,
+ Set<ContainerID> containerIDs) throws SCMException {
+ node2ContainerMap.insertNewDatanode(uuid, containerIDs);
+ }
+
+ /**
* Move Stale or Dead node to healthy if we got a heartbeat from them.
* Move healthy nodes to stale nodes if it is needed.
* Move Stales node to dead if needed.
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0541d763/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java
----------------------------------------------------------------------
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java
index 620c816..36a6f15 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java
@@ -21,8 +21,13 @@ import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import org.apache.hadoop.hdds.protocol.proto
.StorageContainerDatanodeProtocolProtos.PipelineReportsProto;
+import org.apache.hadoop.hdds.scm.container.ContainerID;
+import org.apache.hadoop.hdds.scm.container.common.helpers.Pipeline;
+import org.apache.hadoop.hdds.scm.container.common.helpers.PipelineID;
+import org.apache.hadoop.hdds.scm.exceptions.SCMException;
import org.apache.hadoop.hdds.scm.node.states.NodeAlreadyExistsException;
import org.apache.hadoop.hdds.scm.node.states.NodeNotFoundException;
+import org.apache.hadoop.hdds.scm.node.states.ReportResult;
import org.apache.hadoop.hdds.scm.server.StorageContainerManager;
import org.apache.hadoop.hdds.scm.VersionInfo;
import org.apache.hadoop.hdds.scm.container.placement.metrics.SCMNodeMetric;
@@ -59,6 +64,7 @@ import java.net.InetAddress;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -471,6 +477,83 @@ public class SCMNodeManager
return nodeCountMap;
}
+ /**
+ * Get set of pipelines a datanode is part of.
+ * @param dnId - datanodeID
+ * @return Set of PipelineID
+ */
+ @Override
+ public Set<PipelineID> getPipelineByDnID(UUID dnId) {
+ return nodeStateManager.getPipelineByDnID(dnId);
+ }
+
+
+ /**
+ * Add pipeline information in the NodeManager.
+ * @param pipeline - Pipeline to be added
+ */
+ @Override
+ public void addPipeline(Pipeline pipeline) {
+ nodeStateManager.addPipeline(pipeline);
+ }
+
+ /**
+ * Remove a pipeline information from the NodeManager.
+ * @param pipeline - Pipeline to be removed
+ */
+ @Override
+ public void removePipeline(Pipeline pipeline) {
+ nodeStateManager.removePipeline(pipeline);
+ }
+
+ /**
+ * Update set of containers available on a datanode.
+ * @param uuid - DatanodeID
+ * @param containerIds - Set of containerIDs
+ * @throws SCMException - if datanode is not known. For new datanode use
+ * addDatanodeInContainerMap call.
+ */
+ @Override
+ public void setContainersForDatanode(UUID uuid,
+ Set<ContainerID> containerIds) throws SCMException {
+ nodeStateManager.setContainersForDatanode(uuid, containerIds);
+ }
+
+ /**
+ * Process containerReport received from datanode.
+ * @param uuid - DataonodeID
+ * @param containerIds - Set of containerIDs
+ * @return The result after processing containerReport
+ */
+ @Override
+ public ReportResult<ContainerID> processContainerReport(UUID uuid,
+ Set<ContainerID> containerIds) {
+ return nodeStateManager.processContainerReport(uuid, containerIds);
+ }
+
+ /**
+ * Return set of containerIDs available on a datanode.
+ * @param uuid - DatanodeID
+ * @return - set of containerIDs
+ */
+ @Override
+ public Set<ContainerID> getContainers(UUID uuid) {
+ return nodeStateManager.getContainers(uuid);
+ }
+
+ /**
+ * Insert a new datanode with set of containerIDs for containers available
+ * on it.
+ * @param uuid - DatanodeID
+ * @param containerIDs - Set of ContainerIDs
+ * @throws SCMException - if datanode already exists
+ */
+ @Override
+ public void addDatanodeInContainerMap(UUID uuid,
+ Set<ContainerID> containerIDs) throws SCMException {
+ nodeStateManager.addDatanodeInContainerMap(uuid, containerIDs);
+ }
+
// TODO:
// Since datanode commands are added through event queue, onMessage method
// should take care of adding commands to command queue.
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0541d763/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeStorageStatMap.java
----------------------------------------------------------------------
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeStorageStatMap.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeStorageStatMap.java
index 6ea83df..1b0e5b5 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeStorageStatMap.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeStorageStatMap.java
@@ -147,7 +147,7 @@ public class SCMNodeStorageStatMap implements SCMNodeStorageStatMXBean {
* @param datanodeID - UUID of DN.
* @param report - set of Storage Reports for the Datanode.
* @throws SCMException - if we don't know about this datanode, for new DN
- * use insertNewDatanode.
+ * use addDatanodeInContainerMap.
*/
public void updateDatanodeMap(UUID datanodeID,
Set<StorageLocationReport> report) throws SCMException {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0541d763/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/StaleNodeHandler.java
----------------------------------------------------------------------
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/StaleNodeHandler.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/StaleNodeHandler.java
index ddbba82..48939f1 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/StaleNodeHandler.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/StaleNodeHandler.java
@@ -19,25 +19,18 @@
package org.apache.hadoop.hdds.scm.node;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
-import org.apache.hadoop.hdds.scm.node.states.Node2ContainerMap;
import org.apache.hadoop.hdds.scm.pipelines.PipelineSelector;
import org.apache.hadoop.hdds.server.events.EventHandler;
import org.apache.hadoop.hdds.server.events.EventPublisher;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Handles Stale node event.
*/
public class StaleNodeHandler implements EventHandler<DatanodeDetails> {
- static final Logger LOG = LoggerFactory.getLogger(StaleNodeHandler.class);
- private final Node2ContainerMap node2ContainerMap;
private final PipelineSelector pipelineSelector;
- public StaleNodeHandler(Node2ContainerMap node2ContainerMap,
- PipelineSelector pipelineSelector) {
- this.node2ContainerMap = node2ContainerMap;
+ public StaleNodeHandler(PipelineSelector pipelineSelector) {
this.pipelineSelector = pipelineSelector;
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0541d763/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/states/Node2ContainerMap.java
----------------------------------------------------------------------
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/states/Node2ContainerMap.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/states/Node2ContainerMap.java
index 549080a..9625f81 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/states/Node2ContainerMap.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/states/Node2ContainerMap.java
@@ -70,7 +70,7 @@ public class Node2ContainerMap extends Node2ObjectsMap<ContainerID> {
* @param datanodeID - UUID of DN.
* @param containers - Set of Containers tht is present on DN.
* @throws SCMException - if we don't know about this datanode, for new DN
- * use insertNewDatanode.
+ * use addDatanodeInContainerMap.
*/
public void setContainersForDatanode(UUID datanodeID,
Set<ContainerID> containers) throws SCMException {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0541d763/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/states/Node2PipelineMap.java
----------------------------------------------------------------------
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/states/Node2PipelineMap.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/states/Node2PipelineMap.java
new file mode 100644
index 0000000..87f2222
--- /dev/null
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/states/Node2PipelineMap.java
@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ *
+ */
+
+package org.apache.hadoop.hdds.scm.node.states;
+
+import org.apache.hadoop.hdds.protocol.DatanodeDetails;
+import org.apache.hadoop.hdds.scm.container.common.helpers.Pipeline;
+import org.apache.hadoop.hdds.scm.container.common.helpers.PipelineID;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.UUID;
+
+/**
+ * This data structure maintains the list of pipelines which the given datanode is a part of. This
+ * information will be added whenever a new pipeline allocation happens.
+ *
+ * <p>TODO: this information needs to be regenerated from pipeline reports on SCM restart
+ */
+public class Node2PipelineMap extends Node2ObjectsMap<PipelineID> {
+
+ /** Constructs a Node2PipelineMap Object. */
+ public Node2PipelineMap() {
+ super();
+ }
+
+ /**
+ * Returns null if there no pipelines associated with this datanode ID.
+ *
+ * @param datanode - UUID
+ * @return Set of pipelines or Null.
+ */
+ public Set<PipelineID> getPipelines(UUID datanode) {
+ return getObjects(datanode);
+ }
+
+ /**
+ * Adds a pipeline entry to a given dataNode in the map.
+ *
+ * @param pipeline Pipeline to be added
+ */
+ public synchronized void addPipeline(Pipeline pipeline) {
+ for (DatanodeDetails details : pipeline.getDatanodes().values()) {
+ UUID dnId = details.getUuid();
+ dn2ObjectMap.computeIfAbsent(dnId, k -> new HashSet<>())
+ .add(pipeline.getId());
+ }
+ }
+
+ public synchronized void removePipeline(Pipeline pipeline) {
+ for (DatanodeDetails details : pipeline.getDatanodes().values()) {
+ UUID dnId = details.getUuid();
+ dn2ObjectMap.computeIfPresent(dnId,
+ (k, v) -> {
+ v.remove(pipeline.getId());
+ return v;
+ });
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0541d763/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipelines/Node2PipelineMap.java
----------------------------------------------------------------------
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipelines/Node2PipelineMap.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipelines/Node2PipelineMap.java
deleted file mode 100644
index 87f2222..0000000
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipelines/Node2PipelineMap.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- *
- */
-
-package org.apache.hadoop.hdds.scm.node.states;
-
-import org.apache.hadoop.hdds.protocol.DatanodeDetails;
-import org.apache.hadoop.hdds.scm.container.common.helpers.Pipeline;
-import org.apache.hadoop.hdds.scm.container.common.helpers.PipelineID;
-
-import java.util.HashSet;
-import java.util.Set;
-import java.util.UUID;
-
-/**
- * This data structure maintains the list of pipelines which the given datanode is a part of. This
- * information will be added whenever a new pipeline allocation happens.
- *
- * <p>TODO: this information needs to be regenerated from pipeline reports on SCM restart
- */
-public class Node2PipelineMap extends Node2ObjectsMap<PipelineID> {
-
- /** Constructs a Node2PipelineMap Object. */
- public Node2PipelineMap() {
- super();
- }
-
- /**
- * Returns null if there no pipelines associated with this datanode ID.
- *
- * @param datanode - UUID
- * @return Set of pipelines or Null.
- */
- public Set<PipelineID> getPipelines(UUID datanode) {
- return getObjects(datanode);
- }
-
- /**
- * Adds a pipeline entry to a given dataNode in the map.
- *
- * @param pipeline Pipeline to be added
- */
- public synchronized void addPipeline(Pipeline pipeline) {
- for (DatanodeDetails details : pipeline.getDatanodes().values()) {
- UUID dnId = details.getUuid();
- dn2ObjectMap.computeIfAbsent(dnId, k -> new HashSet<>())
- .add(pipeline.getId());
- }
- }
-
- public synchronized void removePipeline(Pipeline pipeline) {
- for (DatanodeDetails details : pipeline.getDatanodes().values()) {
- UUID dnId = details.getUuid();
- dn2ObjectMap.computeIfPresent(dnId,
- (k, v) -> {
- v.remove(pipeline.getId());
- return v;
- });
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0541d763/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipelines/PipelineSelector.java
----------------------------------------------------------------------
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipelines/PipelineSelector.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipelines/PipelineSelector.java
index 59d937e..c8d22ff 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipelines/PipelineSelector.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipelines/PipelineSelector.java
@@ -33,7 +33,6 @@ import org.apache.hadoop.hdds.scm.container.placement.algorithms
import org.apache.hadoop.hdds.scm.events.SCMEvents;
import org.apache.hadoop.hdds.scm.exceptions.SCMException;
import org.apache.hadoop.hdds.scm.node.NodeManager;
-import org.apache.hadoop.hdds.scm.node.states.Node2PipelineMap;
import org.apache.hadoop.hdds.scm.pipelines.ratis.RatisManagerImpl;
import org.apache.hadoop.hdds.scm.pipelines.standalone.StandaloneManagerImpl;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
@@ -61,7 +60,6 @@ import java.util.HashMap;
import java.util.Set;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import java.util.UUID;
import java.util.concurrent.TimeUnit;
import static org.apache.hadoop.hdds.scm.exceptions.SCMException.ResultCodes
@@ -85,7 +83,7 @@ public class PipelineSelector {
private final long containerSize;
private final MetadataStore pipelineStore;
private final PipelineStateManager stateManager;
- private final Node2PipelineMap node2PipelineMap;
+ private final NodeManager nodeManager;
private final Map<PipelineID, HashSet<ContainerID>> pipeline2ContainerMap;
private final Map<PipelineID, Pipeline> pipelineMap;
private final LeaseManager<Pipeline> pipelineLeaseManager;
@@ -105,7 +103,6 @@ public class PipelineSelector {
ScmConfigKeys.OZONE_SCM_CONTAINER_SIZE,
ScmConfigKeys.OZONE_SCM_CONTAINER_SIZE_DEFAULT,
StorageUnit.BYTES);
- node2PipelineMap = new Node2PipelineMap();
pipelineMap = new ConcurrentHashMap<>();
pipelineManagerMap = new HashMap<>();
@@ -124,6 +121,7 @@ public class PipelineSelector {
pipelineLeaseManager.start();
stateManager = new PipelineStateManager();
+ this.nodeManager = nodeManager;
pipeline2ContainerMap = new HashMap<>();
// Write the container name to pipeline mapping.
@@ -361,10 +359,6 @@ public class PipelineSelector {
}
}
- public Set<PipelineID> getPipelineByDnID(UUID dnId) {
- return node2PipelineMap.getPipelines(dnId);
- }
-
private void addExistingPipeline(Pipeline pipeline) throws IOException {
LifeCycleState state = pipeline.getLifeCycleState();
switch (state) {
@@ -379,7 +373,7 @@ public class PipelineSelector {
// when all the nodes have reported.
pipelineMap.put(pipeline.getId(), pipeline);
pipeline2ContainerMap.put(pipeline.getId(), new HashSet<>());
- node2PipelineMap.addPipeline(pipeline);
+ nodeManager.addPipeline(pipeline);
// reset the datanodes in the pipeline
// they will be reset on
pipeline.resetPipeline();
@@ -393,7 +387,7 @@ public class PipelineSelector {
}
public void handleStaleNode(DatanodeDetails dn) {
- Set<PipelineID> pipelineIDs = getPipelineByDnID(dn.getUuid());
+ Set<PipelineID> pipelineIDs = nodeManager.getPipelineByDnID(dn.getUuid());
for (PipelineID id : pipelineIDs) {
LOG.info("closing pipeline {}.", id);
eventPublisher.fireEvent(SCMEvents.PIPELINE_CLOSE, id);
@@ -436,7 +430,7 @@ public class PipelineSelector {
case CREATE:
pipelineMap.put(pipeline.getId(), pipeline);
pipeline2ContainerMap.put(pipeline.getId(), new HashSet<>());
- node2PipelineMap.addPipeline(pipeline);
+ nodeManager.addPipeline(pipeline);
// Acquire lease on pipeline
Lease<Pipeline> pipelineLease = pipelineLeaseManager.acquire(pipeline);
// Register callback to be executed in case of timeout
@@ -459,7 +453,7 @@ public class PipelineSelector {
case TIMEOUT:
closePipeline(pipeline);
pipeline2ContainerMap.remove(pipeline.getId());
- node2PipelineMap.removePipeline(pipeline);
+ nodeManager.removePipeline(pipeline);
pipelineMap.remove(pipeline.getId());
break;
default:
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0541d763/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
----------------------------------------------------------------------
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
index bb72075..a6a967c 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
@@ -62,7 +62,6 @@ import org.apache.hadoop.hdds.scm.node.NodeManager;
import org.apache.hadoop.hdds.scm.node.NodeReportHandler;
import org.apache.hadoop.hdds.scm.node.SCMNodeManager;
import org.apache.hadoop.hdds.scm.node.StaleNodeHandler;
-import org.apache.hadoop.hdds.scm.node.states.Node2ContainerMap;
import org.apache.hadoop.hdds.scm.pipelines.PipelineCloseHandler;
import org.apache.hadoop.hdds.scm.pipelines.PipelineActionEventHandler;
import org.apache.hadoop.hdds.scm.pipelines.PipelineReportHandler;
@@ -212,8 +211,6 @@ public final class StorageContainerManager extends ServiceRuntimeInfoImpl
scmBlockManager = new BlockManagerImpl(
conf, getScmNodeManager(), scmContainerManager, eventQueue);
- Node2ContainerMap node2ContainerMap = new Node2ContainerMap();
-
replicationStatus = new ReplicationActivityStatus();
CloseContainerEventHandler closeContainerHandler =
@@ -226,18 +223,17 @@ public final class StorageContainerManager extends ServiceRuntimeInfoImpl
CommandStatusReportHandler cmdStatusReportHandler =
new CommandStatusReportHandler();
- NewNodeHandler newNodeHandler = new NewNodeHandler(node2ContainerMap);
+ NewNodeHandler newNodeHandler = new NewNodeHandler(scmNodeManager);
StaleNodeHandler staleNodeHandler =
- new StaleNodeHandler(node2ContainerMap,
- scmContainerManager.getPipelineSelector());
- DeadNodeHandler deadNodeHandler = new DeadNodeHandler(node2ContainerMap,
- getScmContainerManager().getStateManager(), scmNodeManager);
+ new StaleNodeHandler(scmContainerManager.getPipelineSelector());
+ DeadNodeHandler deadNodeHandler = new DeadNodeHandler(scmNodeManager,
+ getScmContainerManager().getStateManager());
ContainerActionsHandler actionsHandler = new ContainerActionsHandler();
PendingDeleteHandler pendingDeleteHandler =
new PendingDeleteHandler(scmBlockManager.getSCMBlockDeletingService());
ContainerReportHandler containerReportHandler =
- new ContainerReportHandler(scmContainerManager, node2ContainerMap,
+ new ContainerReportHandler(scmContainerManager, scmNodeManager,
replicationStatus);
scmChillModeManager = new SCMChillModeManager(conf,
getScmContainerManager().getStateManager().getAllContainers(),
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0541d763/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java
----------------------------------------------------------------------
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java
index 0d90728..3221053 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java
@@ -19,9 +19,14 @@ package org.apache.hadoop.hdds.scm.container;
import org.apache.hadoop.hdds.protocol.proto
.StorageContainerDatanodeProtocolProtos.PipelineReportsProto;
import org.apache.hadoop.hdds.scm.TestUtils;
+import org.apache.hadoop.hdds.scm.container.common.helpers.Pipeline;
+import org.apache.hadoop.hdds.scm.container.common.helpers.PipelineID;
import org.apache.hadoop.hdds.scm.container.placement.metrics.SCMNodeMetric;
import org.apache.hadoop.hdds.scm.container.placement.metrics.SCMNodeStat;
+import org.apache.hadoop.hdds.scm.exceptions.SCMException;
import org.apache.hadoop.hdds.scm.node.NodeManager;
+import org.apache.hadoop.hdds.scm.node.states.Node2ContainerMap;
+import org.apache.hadoop.hdds.scm.node.states.Node2PipelineMap;
import org.apache.hadoop.hdds.scm.node.states.NodeNotFoundException;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
@@ -29,6 +34,7 @@ import org.apache.hadoop.hdds.protocol.proto
.StorageContainerDatanodeProtocolProtos.NodeReportProto;
import org.apache.hadoop.hdds.protocol.proto
.StorageContainerDatanodeProtocolProtos.SCMVersionRequestProto;
+import org.apache.hadoop.hdds.scm.node.states.ReportResult;
import org.apache.hadoop.hdds.server.events.EventPublisher;
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.ozone.protocol.VersionResponse;
@@ -42,6 +48,7 @@ import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.UUID;
import static org.apache.hadoop.hdds.protocol.proto.HddsProtos.NodeState.DEAD;
@@ -73,12 +80,16 @@ public class MockNodeManager implements NodeManager {
private final SCMNodeStat aggregateStat;
private boolean chillmode;
private final Map<UUID, List<SCMCommand>> commandMap;
+ private final Node2PipelineMap node2PipelineMap;
+ private final Node2ContainerMap node2ContainerMap;
public MockNodeManager(boolean initializeFakeNodes, int nodeCount) {
this.healthyNodes = new LinkedList<>();
this.staleNodes = new LinkedList<>();
this.deadNodes = new LinkedList<>();
this.nodeMetricMap = new HashMap<>();
+ this.node2PipelineMap = new Node2PipelineMap();
+ this.node2ContainerMap = new Node2ContainerMap();
aggregateStat = new SCMNodeStat();
if (initializeFakeNodes) {
for (int x = 0; x < nodeCount; x++) {
@@ -289,6 +300,34 @@ public class MockNodeManager implements NodeManager {
return null;
}
+ /**
+ * Get set of pipelines a datanode is part of.
+ * @param dnId - datanodeID
+ * @return Set of PipelineID
+ */
+ @Override
+ public Set<PipelineID> getPipelineByDnID(UUID dnId) {
+ return node2PipelineMap.getPipelines(dnId);
+ }
+
+ /**
+ * Add pipeline information in the NodeManager.
+ * @param pipeline - Pipeline to be added
+ */
+ @Override
+ public void addPipeline(Pipeline pipeline) {
+ node2PipelineMap.addPipeline(pipeline);
+ }
+
+ /**
+ * Remove a pipeline information from the NodeManager.
+ * @param pipeline - Pipeline to be removed
+ */
+ @Override
+ public void removePipeline(Pipeline pipeline) {
+ node2PipelineMap.removePipeline(pipeline);
+ }
+
@Override
public void addDatanodeCommand(UUID dnId, SCMCommand command) {
if(commandMap.containsKey(dnId)) {
@@ -313,6 +352,54 @@ public class MockNodeManager implements NodeManager {
// do nothing
}
+ /**
+ * Update set of containers available on a datanode.
+ * @param uuid - DatanodeID
+ * @param containerIds - Set of containerIDs
+ * @throws SCMException - if datanode is not known. For new datanode use
+ * addDatanodeInContainerMap call.
+ */
+ @Override
+ public void setContainersForDatanode(UUID uuid, Set<ContainerID> containerIds)
+ throws SCMException {
+ node2ContainerMap.setContainersForDatanode(uuid, containerIds);
+ }
+
+ /**
+ * Process containerReport received from datanode.
+ * @param uuid - DataonodeID
+ * @param containerIds - Set of containerIDs
+ * @return The result after processing containerReport
+ */
+ @Override
+ public ReportResult<ContainerID> processContainerReport(UUID uuid,
+ Set<ContainerID> containerIds) {
+ return node2ContainerMap.processReport(uuid, containerIds);
+ }
+
+ /**
+ * Return set of containerIDs available on a datanode.
+ * @param uuid - DatanodeID
+ * @return - set of containerIDs
+ */
+ @Override
+ public Set<ContainerID> getContainers(UUID uuid) {
+ return node2ContainerMap.getContainers(uuid);
+ }
+
+ /**
+ * Insert a new datanode with set of containerIDs for containers available
+ * on it.
+ * @param uuid - DatanodeID
+ * @param containerIDs - Set of ContainerIDs
+ * @throws SCMException - if datanode already exists
+ */
+ @Override
+ public void addDatanodeInContainerMap(UUID uuid,
+ Set<ContainerID> containerIDs) throws SCMException {
+ node2ContainerMap.insertNewDatanode(uuid, containerIDs);
+ }
+
// Returns the number of commands that is queued to this node manager.
public int getCommandCount(DatanodeDetails dd) {
List<SCMCommand> list = commandMap.get(dd.getUuid());
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0541d763/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerReportHandler.java
----------------------------------------------------------------------
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerReportHandler.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerReportHandler.java
index a59179b..f79ae1e 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerReportHandler.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerReportHandler.java
@@ -37,7 +37,7 @@ import org.apache.hadoop.hdds.scm.container.common.helpers.PipelineID;
import org.apache.hadoop.hdds.scm.container.replication
.ReplicationActivityStatus;
import org.apache.hadoop.hdds.scm.container.replication.ReplicationRequest;
-import org.apache.hadoop.hdds.scm.node.states.Node2ContainerMap;
+import org.apache.hadoop.hdds.scm.node.NodeManager;
import org.apache.hadoop.hdds.scm.pipelines.PipelineSelector;
import org.apache.hadoop.hdds.scm.server.SCMDatanodeHeartbeatDispatcher
.ContainerReportFromDatanode;
@@ -60,6 +60,7 @@ import org.slf4j.LoggerFactory;
public class TestContainerReportHandler implements EventPublisher {
private List<Object> publishedEvents = new ArrayList<>();
+ private final NodeManager nodeManager = new MockNodeManager(true, 1);
private static final Logger LOG =
LoggerFactory.getLogger(TestContainerReportHandler.class);
@@ -73,7 +74,6 @@ public class TestContainerReportHandler implements EventPublisher {
public void test() throws IOException {
//GIVEN
OzoneConfiguration conf = new OzoneConfiguration();
- Node2ContainerMap node2ContainerMap = new Node2ContainerMap();
Mapping mapping = Mockito.mock(Mapping.class);
PipelineSelector selector = Mockito.mock(PipelineSelector.class);
@@ -96,17 +96,17 @@ public class TestContainerReportHandler implements EventPublisher {
new ReplicationActivityStatus();
ContainerReportHandler reportHandler =
- new ContainerReportHandler(mapping, node2ContainerMap,
+ new ContainerReportHandler(mapping, nodeManager,
replicationActivityStatus);
DatanodeDetails dn1 = TestUtils.randomDatanodeDetails();
DatanodeDetails dn2 = TestUtils.randomDatanodeDetails();
DatanodeDetails dn3 = TestUtils.randomDatanodeDetails();
DatanodeDetails dn4 = TestUtils.randomDatanodeDetails();
- node2ContainerMap.insertNewDatanode(dn1.getUuid(), new HashSet<>());
- node2ContainerMap.insertNewDatanode(dn2.getUuid(), new HashSet<>());
- node2ContainerMap.insertNewDatanode(dn3.getUuid(), new HashSet<>());
- node2ContainerMap.insertNewDatanode(dn4.getUuid(), new HashSet<>());
+ nodeManager.addDatanodeInContainerMap(dn1.getUuid(), new HashSet<>());
+ nodeManager.addDatanodeInContainerMap(dn2.getUuid(), new HashSet<>());
+ nodeManager.addDatanodeInContainerMap(dn3.getUuid(), new HashSet<>());
+ nodeManager.addDatanodeInContainerMap(dn4.getUuid(), new HashSet<>());
PipelineSelector pipelineSelector = Mockito.mock(PipelineSelector.class);
Pipeline pipeline = new Pipeline("leader", LifeCycleState.CLOSED,
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0541d763/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestDeadNodeHandler.java
----------------------------------------------------------------------
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestDeadNodeHandler.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestDeadNodeHandler.java
index 6966322..7bba032 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestDeadNodeHandler.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestDeadNodeHandler.java
@@ -39,7 +39,6 @@ import org.apache.hadoop.hdds.scm.container.replication.ReplicationRequest;
import org.apache.hadoop.hdds.scm.events.SCMEvents;
import org.apache.hadoop.hdds.scm.container.placement.metrics.SCMNodeStat;
import org.apache.hadoop.hdds.scm.exceptions.SCMException;
-import org.apache.hadoop.hdds.scm.node.states.Node2ContainerMap;
import org.apache.hadoop.hdds.scm.pipelines.PipelineSelector;
import org.apache.hadoop.hdds.scm.server.SCMDatanodeHeartbeatDispatcher.NodeReportFromDatanode;
import org.apache.hadoop.hdds.server.events.EventPublisher;
@@ -60,7 +59,6 @@ public class TestDeadNodeHandler {
private List<ReplicationRequest> sentEvents = new ArrayList<>();
private SCMNodeManager nodeManager;
- private Node2ContainerMap node2ContainerMap;
private ContainerStateManager containerStateManager;
private NodeReportHandler nodeReportHandler;
private DeadNodeHandler deadNodeHandler;
@@ -70,14 +68,13 @@ public class TestDeadNodeHandler {
@Before
public void setup() throws IOException {
OzoneConfiguration conf = new OzoneConfiguration();
- node2ContainerMap = new Node2ContainerMap();
containerStateManager = new ContainerStateManager(conf,
Mockito.mock(Mapping.class),
Mockito.mock(PipelineSelector.class));
eventQueue = new EventQueue();
nodeManager = new SCMNodeManager(conf, "cluster1", null, eventQueue);
- deadNodeHandler = new DeadNodeHandler(node2ContainerMap,
- containerStateManager, nodeManager);
+ deadNodeHandler = new DeadNodeHandler(nodeManager,
+ containerStateManager);
eventQueue.addHandler(SCMEvents.DEAD_NODE, deadNodeHandler);
publisher = Mockito.mock(EventPublisher.class);
nodeReportHandler = new NodeReportHandler(nodeManager);
@@ -96,8 +93,8 @@ public class TestDeadNodeHandler {
ContainerInfo container3 =
TestUtils.allocateContainer(containerStateManager);
- registerReplicas(node2ContainerMap, datanode1, container1, container2);
- registerReplicas(node2ContainerMap, datanode2, container1, container3);
+ registerReplicas(datanode1, container1, container2);
+ registerReplicas(datanode2, container1, container3);
registerReplicas(containerStateManager, container1, datanode1, datanode2);
registerReplicas(containerStateManager, container2, datanode1);
@@ -105,13 +102,8 @@ public class TestDeadNodeHandler {
TestUtils.closeContainer(containerStateManager, container1);
- //WHEN datanode1 is dead
deadNodeHandler.onMessage(datanode1, publisher);
- //THEN
- //node2ContainerMap has not been changed
- Assert.assertEquals(2, node2ContainerMap.size());
-
Set<DatanodeDetails> container1Replicas =
containerStateManager.getContainerStateMap()
.getContainerReplicas(new ContainerID(container1.getContainerID()));
@@ -168,7 +160,7 @@ public class TestDeadNodeHandler {
ContainerInfo container1 =
TestUtils.allocateContainer(containerStateManager);
- registerReplicas(node2ContainerMap, datanode1, container1);
+ registerReplicas(datanode1, container1);
SCMNodeStat stat = nodeManager.getStats();
Assert.assertTrue(stat.getCapacity().get() == 300);
@@ -211,7 +203,7 @@ public class TestDeadNodeHandler {
ContainerInfo container1 =
TestUtils.allocateContainer(containerStateManager);
- registerReplicas(node2ContainerMap, dn1, container1);
+ registerReplicas(dn1, container1);
deadNodeHandler.onMessage(dn1, eventQueue);
Assert.assertTrue(logCapturer.getOutput().contains(
@@ -226,12 +218,11 @@ public class TestDeadNodeHandler {
datanodes);
}
- private void registerReplicas(Node2ContainerMap node2ConMap,
- DatanodeDetails datanode,
+ private void registerReplicas(DatanodeDetails datanode,
ContainerInfo... containers)
throws SCMException {
- node2ConMap
- .insertNewDatanode(datanode.getUuid(),
+ nodeManager
+ .addDatanodeInContainerMap(datanode.getUuid(),
Arrays.stream(containers)
.map(container -> new ContainerID(container.getContainerID()))
.collect(Collectors.toSet()));
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0541d763/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/container/testutils/ReplicationNodeManagerMock.java
----------------------------------------------------------------------
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/container/testutils/ReplicationNodeManagerMock.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/container/testutils/ReplicationNodeManagerMock.java
index a9a00ef..74c3932 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/container/testutils/ReplicationNodeManagerMock.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/container/testutils/ReplicationNodeManagerMock.java
@@ -19,8 +19,12 @@ package org.apache.hadoop.ozone.container.testutils;
import com.google.common.base.Preconditions;
import org.apache.hadoop.hdds.protocol.proto
.StorageContainerDatanodeProtocolProtos.PipelineReportsProto;
+import org.apache.hadoop.hdds.scm.container.ContainerID;
+import org.apache.hadoop.hdds.scm.container.common.helpers.Pipeline;
+import org.apache.hadoop.hdds.scm.container.common.helpers.PipelineID;
import org.apache.hadoop.hdds.scm.container.placement.metrics.SCMNodeMetric;
import org.apache.hadoop.hdds.scm.container.placement.metrics.SCMNodeStat;
+import org.apache.hadoop.hdds.scm.exceptions.SCMException;
import org.apache.hadoop.hdds.scm.node.CommandQueue;
import org.apache.hadoop.hdds.scm.node.NodeManager;
import org.apache.hadoop.hdds.scm.node.states.NodeNotFoundException;
@@ -30,6 +34,7 @@ import org.apache.hadoop.hdds.protocol.proto
.StorageContainerDatanodeProtocolProtos.NodeReportProto;
import org.apache.hadoop.hdds.protocol.proto
.StorageContainerDatanodeProtocolProtos.SCMVersionRequestProto;
+import org.apache.hadoop.hdds.scm.node.states.ReportResult;
import org.apache.hadoop.hdds.server.events.EventPublisher;
import org.apache.hadoop.ozone.protocol.VersionResponse;
import org.apache.hadoop.ozone.protocol.commands.CommandForDatanode;
@@ -39,6 +44,7 @@ import org.apache.hadoop.ozone.protocol.commands.SCMCommand;
import java.io.IOException;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.UUID;
/**
@@ -217,6 +223,82 @@ public class ReplicationNodeManagerMock implements NodeManager {
}
/**
+ * Get set of pipelines a datanode is part of.
+ * @param dnId - datanodeID
+ * @return Set of PipelineID
+ */
+ @Override
+ public Set<PipelineID> getPipelineByDnID(UUID dnId) {
+ throw new UnsupportedOperationException("Not yet implemented");
+ }
+
+ /**
+ * Add pipeline information in the NodeManager.
+ * @param pipeline - Pipeline to be added
+ */
+ @Override
+ public void addPipeline(Pipeline pipeline) {
+ throw new UnsupportedOperationException("Not yet implemented");
+ }
+
+ /**
+ * Remove a pipeline information from the NodeManager.
+ * @param pipeline - Pipeline to be removed
+ */
+ @Override
+ public void removePipeline(Pipeline pipeline) {
+ throw new UnsupportedOperationException("Not yet implemented");
+ }
+
+ /**
+ * Update set of containers available on a datanode.
+ * @param uuid - DatanodeID
+ * @param containerIds - Set of containerIDs
+ * @throws SCMException - if datanode is not known. For new datanode use
+ * addDatanodeInContainerMap call.
+ */
+ @Override
+ public void setContainersForDatanode(UUID uuid, Set<ContainerID> containerIds)
+ throws SCMException {
+ throw new UnsupportedOperationException("Not yet implemented");
+ }
+
+ /**
+ * Process containerReport received from datanode.
+ * @param uuid - DataonodeID
+ * @param containerIds - Set of containerIDs
+ * @return The result after processing containerReport
+ */
+ @Override
+ public ReportResult<ContainerID> processContainerReport(UUID uuid,
+ Set<ContainerID> containerIds) {
+ throw new UnsupportedOperationException("Not yet implemented");
+ }
+
+ /**
+ * Return set of containerIDs available on a datanode.
+ * @param uuid - DatanodeID
+ * @return - set of containerIDs
+ */
+ @Override
+ public Set<ContainerID> getContainers(UUID uuid) {
+ throw new UnsupportedOperationException("Not yet implemented");
+ }
+
+ /**
+ * Insert a new datanode with set of containerIDs for containers available
+ * on it.
+ * @param uuid - DatanodeID
+ * @param containerIDs - Set of ContainerIDs
+ * @throws SCMException - if datanode already exists
+ */
+ @Override
+ public void addDatanodeInContainerMap(UUID uuid,
+ Set<ContainerID> containerIDs) throws SCMException {
+ throw new UnsupportedOperationException("Not yet implemented");
+ }
+
+ /**
* Closes this stream and releases any system resources associated
* with it. If the stream is already closed then invoking this
* method has no effect.
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0541d763/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestNode2PipelineMap.java
----------------------------------------------------------------------
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestNode2PipelineMap.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestNode2PipelineMap.java
index ad3798e..e61a909 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestNode2PipelineMap.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestNode2PipelineMap.java
@@ -97,7 +97,7 @@ public class TestNode2PipelineMap {
Assert.assertEquals(3, dns.size());
// get pipeline details by dnid
- Set<PipelineID> pipelines = mapping.getPipelineSelector()
+ Set<PipelineID> pipelines = scm.getScmNodeManager()
.getPipelineByDnID(dns.get(0).getUuid());
Assert.assertEquals(1, pipelines.size());
pipelines.forEach(p -> Assert.assertEquals(p,
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0541d763/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineClose.java
----------------------------------------------------------------------
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineClose.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineClose.java
index 5eabfb9..b02eae2 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineClose.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineClose.java
@@ -119,7 +119,7 @@ public class TestPipelineClose {
HddsProtos.LifeCycleState.CLOSED);
for (DatanodeDetails dn : ratisContainer1.getPipeline().getMachines()) {
// Assert that the pipeline has been removed from Node2PipelineMap as well
- Assert.assertEquals(pipelineSelector.getPipelineByDnID(
+ Assert.assertEquals(scm.getScmNodeManager().getPipelineByDnID(
dn.getUuid()).size(), 0);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[5/5] hadoop git commit: HDDS-526. Clean previous chill mode code
from NodeManager. Contributed by Ajay Kumar.
Posted by na...@apache.org.
HDDS-526. Clean previous chill mode code from NodeManager. Contributed by Ajay Kumar.
(cherry picked from commit 7b374482d2911fe7bc9217cb5d1a9261013bd034)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f4009aef
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f4009aef
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f4009aef
Branch: refs/heads/ozone-0.2
Commit: f4009aefc0f3b19834661c28121844d19b79f16e
Parents: 0541d76
Author: Nanda kumar <na...@apache.org>
Authored: Wed Oct 3 15:15:43 2018 +0530
Committer: Nanda kumar <na...@apache.org>
Committed: Wed Oct 3 15:26:50 2018 +0530
----------------------------------------------------------------------
.../hadoop/hdds/scm/block/BlockManagerImpl.java | 7 +-
.../hadoop/hdds/scm/node/NodeManager.java | 20 ---
.../hadoop/hdds/scm/node/NodeManagerMXBean.java | 19 ---
.../hadoop/hdds/scm/node/SCMNodeManager.java | 109 ----------------
.../hadoop/hdds/scm/server/SCMMXBean.java | 12 ++
.../scm/server/StorageContainerManager.java | 15 +++
.../hdds/scm/container/MockNodeManager.java | 58 ---------
.../hdds/scm/node/TestContainerPlacement.java | 6 -
.../hadoop/hdds/scm/node/TestNodeManager.java | 123 +------------------
.../testutils/ReplicationNodeManagerMock.java | 58 ---------
.../TestContainerStateManagerIntegration.java | 1 +
.../hadoop/ozone/MiniOzoneClusterImpl.java | 4 +-
.../apache/hadoop/ozone/scm/TestSCMMXBean.java | 38 ++----
13 files changed, 47 insertions(+), 423 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f4009aef/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/block/BlockManagerImpl.java
----------------------------------------------------------------------
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/block/BlockManagerImpl.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/block/BlockManagerImpl.java
index d383c68..4777016 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/block/BlockManagerImpl.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/block/BlockManagerImpl.java
@@ -50,8 +50,6 @@ import java.util.Random;
import java.util.concurrent.TimeUnit;
import static org.apache.hadoop.hdds.scm.exceptions.SCMException.ResultCodes
- .CHILL_MODE_EXCEPTION;
-import static org.apache.hadoop.hdds.scm.exceptions.SCMException.ResultCodes
.INVALID_BLOCK_SIZE;
import static org.apache.hadoop.ozone.OzoneConfigKeys
.OZONE_BLOCK_DELETING_SERVICE_INTERVAL;
@@ -345,10 +343,7 @@ public class BlockManagerImpl implements EventHandler<Boolean>,
*/
@Override
public void deleteBlocks(List<BlockID> blockIDs) throws IOException {
- if (!nodeManager.isOutOfChillMode()) {
- throw new SCMException("Unable to delete block while in chill mode",
- CHILL_MODE_EXCEPTION);
- }
+ ScmUtils.preCheck(ScmOps.deleteBlock, chillModePrecheck);
LOG.info("Deleting blocks {}", StringUtils.join(",", blockIDs));
Map<Long, List<Long>> containerBlocks = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f4009aef/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeManager.java
----------------------------------------------------------------------
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeManager.java
index 0dc1a0c..585d545 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeManager.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeManager.java
@@ -93,26 +93,6 @@ public interface NodeManager extends StorageContainerNodeProtocol,
List<DatanodeDetails> getAllNodes();
/**
- * Chill mode is the period when node manager waits for a minimum
- * configured number of datanodes to report in. This is called chill mode
- * to indicate the period before node manager gets into action.
- *
- * Forcefully exits the chill mode, even if we have not met the minimum
- * criteria of the nodes reporting in.
- */
- void forceExitChillMode();
-
- /**
- * Puts the node manager into manual chill mode.
- */
- void enterChillMode();
-
- /**
- * Brings node manager out of manual chill mode.
- */
- void exitChillMode();
-
- /**
* Returns the aggregated node stats.
* @return the aggregated node stats.
*/
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f4009aef/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeManagerMXBean.java
----------------------------------------------------------------------
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeManagerMXBean.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeManagerMXBean.java
index 3ac993b..d84cf53 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeManagerMXBean.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeManagerMXBean.java
@@ -28,25 +28,6 @@ import java.util.Map;
*/
@InterfaceAudience.Private
public interface NodeManagerMXBean {
- /**
- * Get the minimum number of nodes to get out of chill mode.
- *
- * @return int
- */
- int getMinimumChillModeNodes();
-
- /**
- * Returns a chill mode status string.
- * @return String
- */
- String getChillModeStatus();
-
-
- /**
- * Returns true if node manager is out of chill mode, else false.
- * @return true if out of chill mode, else false
- */
- boolean isOutOfChillMode();
/**
* Get the number of data nodes that in all states.
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f4009aef/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java
----------------------------------------------------------------------
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java
index 36a6f15..4a34136 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java
@@ -66,7 +66,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
-import java.util.concurrent.atomic.AtomicBoolean;
/**
* Maintains information about the Datanodes on SCM side.
@@ -94,22 +93,8 @@ public class SCMNodeManager
// can always calculate it from nodeStats whenever required.
// Aggregated node stats
private SCMNodeStat scmStat;
- // Should we create ChillModeManager and extract all the chill mode logic
- // to a new class?
- private int chillModeNodeCount;
private final String clusterID;
private final VersionInfo version;
- /**
- * During start up of SCM, it will enter into chill mode and will be there
- * until number of Datanodes registered reaches {@code chillModeNodeCount}.
- * This flag is for tracking startup chill mode.
- */
- private AtomicBoolean inStartupChillMode;
- /**
- * Administrator can put SCM into chill mode manually.
- * This flag is for tracking manual chill mode.
- */
- private AtomicBoolean inManualChillMode;
private final CommandQueue commandQueue;
// Node manager MXBean
private ObjectName nmInfoBean;
@@ -128,10 +113,6 @@ public class SCMNodeManager
this.clusterID = clusterID;
this.version = VersionInfo.getLatestVersion();
this.commandQueue = new CommandQueue();
- // TODO: Support this value as a Percentage of known machines.
- this.chillModeNodeCount = 1;
- this.inStartupChillMode = new AtomicBoolean(true);
- this.inManualChillMode = new AtomicBoolean(false);
this.scmManager = scmManager;
LOG.info("Entering startup chill mode.");
registerMXBean();
@@ -184,91 +165,6 @@ public class SCMNodeManager
}
/**
- * Get the minimum number of nodes to get out of Chill mode.
- *
- * @return int
- */
- @Override
- public int getMinimumChillModeNodes() {
- return chillModeNodeCount;
- }
-
- /**
- * Sets the Minimum chill mode nodes count, used only in testing.
- *
- * @param count - Number of nodes.
- */
- @VisibleForTesting
- public void setMinimumChillModeNodes(int count) {
- chillModeNodeCount = count;
- }
-
- /**
- * Returns chill mode Status string.
- * @return String
- */
- @Override
- public String getChillModeStatus() {
- if (inStartupChillMode.get()) {
- return "Still in chill mode, waiting on nodes to report in." +
- String.format(" %d nodes reported, minimal %d nodes required.",
- nodeStateManager.getTotalNodeCount(), getMinimumChillModeNodes());
- }
- if (inManualChillMode.get()) {
- return "Out of startup chill mode, but in manual chill mode." +
- String.format(" %d nodes have reported in.",
- nodeStateManager.getTotalNodeCount());
- }
- return "Out of chill mode." +
- String.format(" %d nodes have reported in.",
- nodeStateManager.getTotalNodeCount());
- }
-
- /**
- * Forcefully exits the chill mode even if we have not met the minimum
- * criteria of exiting the chill mode. This will exit from both startup
- * and manual chill mode.
- */
- @Override
- public void forceExitChillMode() {
- if(inStartupChillMode.get()) {
- LOG.info("Leaving startup chill mode.");
- inStartupChillMode.set(false);
- }
- if(inManualChillMode.get()) {
- LOG.info("Leaving manual chill mode.");
- inManualChillMode.set(false);
- }
- }
-
- /**
- * Puts the node manager into manual chill mode.
- */
- @Override
- public void enterChillMode() {
- LOG.info("Entering manual chill mode.");
- inManualChillMode.set(true);
- }
-
- /**
- * Brings node manager out of manual chill mode.
- */
- @Override
- public void exitChillMode() {
- LOG.info("Leaving manual chill mode.");
- inManualChillMode.set(false);
- }
-
- /**
- * Returns true if node manager is out of chill mode, else false.
- * @return true if out of chill mode, else false
- */
- @Override
- public boolean isOutOfChillMode() {
- return !(inStartupChillMode.get() || inManualChillMode.get());
- }
-
- /**
* Returns the Number of Datanodes by State they are in.
*
* @return int -- count
@@ -379,11 +275,6 @@ public class SCMNodeManager
try {
nodeStateManager.addNode(datanodeDetails);
nodeStateManager.setNodeStat(dnId, new SCMNodeStat());
- if(inStartupChillMode.get() &&
- nodeStateManager.getTotalNodeCount() >= getMinimumChillModeNodes()) {
- inStartupChillMode.getAndSet(false);
- LOG.info("Leaving startup chill mode.");
- }
// Updating Node Report, as registration is successful
updateNodeStat(datanodeDetails.getUuid(), nodeReport);
LOG.info("Data node with ID: {} Registered.", datanodeDetails.getUuid());
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f4009aef/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMMXBean.java
----------------------------------------------------------------------
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMMXBean.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMMXBean.java
index 22d4d56..4093918 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMMXBean.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMMXBean.java
@@ -47,4 +47,16 @@ public interface SCMMXBean extends ServiceRuntimeInfo {
* @return The datanodeUUid to report json string mapping
*/
Map<String, String> getContainerReport();
+
+ /**
+ * Returns chill mode status.
+ * @return boolean
+ */
+ boolean isInChillMode();
+
+ /**
+ * Returns live chill mode container threshold.
+ * @return String
+ */
+ double getChillModeCurrentContainerThreshold();
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f4009aef/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
----------------------------------------------------------------------
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
index a6a967c..bdafe0c 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
@@ -884,6 +884,21 @@ public final class StorageContainerManager extends ServiceRuntimeInfoImpl
return id2StatMap;
}
+ /**
+ * Returns live chill mode container threshold.
+ *
+ * @return String
+ */
+ @Override
+ public double getChillModeCurrentContainerThreshold() {
+ return getCurrentContainerThreshold();
+ }
+
+ /**
+ * Returns chill mode status.
+ * @return boolean
+ */
+ @Override
public boolean isInChillMode() {
return scmChillModeManager.getInChillMode();
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f4009aef/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java
----------------------------------------------------------------------
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java
index 3221053..e32f316 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java
@@ -199,64 +199,6 @@ public class MockNodeManager implements NodeManager {
}
/**
- * Get the minimum number of nodes to get out of chill mode.
- *
- * @return int
- */
- @Override
- public int getMinimumChillModeNodes() {
- return 0;
- }
-
- /**
- * Chill mode is the period when node manager waits for a minimum configured
- * number of datanodes to report in. This is called chill mode to indicate the
- * period before node manager gets into action.
- * <p>
- * Forcefully exits the chill mode, even if we have not met the minimum
- * criteria of the nodes reporting in.
- */
- @Override
- public void forceExitChillMode() {
-
- }
-
- /**
- * Puts the node manager into manual chill mode.
- */
- @Override
- public void enterChillMode() {
-
- }
-
- /**
- * Brings node manager out of manual chill mode.
- */
- @Override
- public void exitChillMode() {
-
- }
-
- /**
- * Returns true if node manager is out of chill mode, else false.
- * @return true if out of chill mode, else false
- */
- @Override
- public boolean isOutOfChillMode() {
- return !chillmode;
- }
-
- /**
- * Returns a chill mode status string.
- *
- * @return String
- */
- @Override
- public String getChillModeStatus() {
- return null;
- }
-
- /**
* Returns the aggregated node stats.
* @return the aggregated node stats.
*/
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f4009aef/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestContainerPlacement.java
----------------------------------------------------------------------
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestContainerPlacement.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestContainerPlacement.java
index 6f8534d..cd79d44 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestContainerPlacement.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestContainerPlacement.java
@@ -56,8 +56,6 @@ import static org.apache.hadoop.hdds.scm.ScmConfigKeys
import static org.apache.hadoop.hdds.protocol.proto.HddsProtos.NodeState
.HEALTHY;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
/**
* Test for different container placement policy.
@@ -96,8 +94,6 @@ public class TestContainerPlacement {
Mockito.mock(DeadNodeHandler.class));
SCMNodeManager nodeManager = new SCMNodeManager(config,
UUID.randomUUID().toString(), null, eventQueue);
- assertFalse("Node manager should be in chill mode",
- nodeManager.isOutOfChillMode());
return nodeManager;
}
@@ -154,8 +150,6 @@ public class TestContainerPlacement {
assertEquals(remaining * nodeCount,
(long) nodeManager.getStats().getRemaining().get());
- assertTrue(nodeManager.isOutOfChillMode());
-
ContainerWithPipeline containerWithPipeline = containerManager
.allocateContainer(
xceiverClientManager.getType(),
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f4009aef/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestNodeManager.java
----------------------------------------------------------------------
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestNodeManager.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestNodeManager.java
index cbe96ee..32ee371 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestNodeManager.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestNodeManager.java
@@ -71,10 +71,8 @@ import static org.apache.hadoop.hdds.protocol.proto.HddsProtos.NodeState
.HEALTHY;
import static org.apache.hadoop.hdds.protocol.proto.HddsProtos.NodeState.STALE;
import static org.apache.hadoop.hdds.scm.events.SCMEvents.DATANODE_COMMAND;
-import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.core.StringStartsWith.startsWith;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
/**
@@ -135,8 +133,6 @@ public class TestNodeManager {
Mockito.mock(DeadNodeHandler.class));
SCMNodeManager nodeManager = new SCMNodeManager(config,
UUID.randomUUID().toString(), null, eventQueue);
- assertFalse("Node manager should be in chill mode",
- nodeManager.isOutOfChillMode());
return nodeManager;
}
@@ -153,8 +149,9 @@ public class TestNodeManager {
InterruptedException, TimeoutException {
try (SCMNodeManager nodeManager = createNodeManager(getConf())) {
+ int registeredNodes = 5;
// Send some heartbeats from different nodes.
- for (int x = 0; x < nodeManager.getMinimumChillModeNodes(); x++) {
+ for (int x = 0; x < registeredNodes; x++) {
DatanodeDetails datanodeDetails = TestUtils
.createRandomDatanodeAndRegister(nodeManager);
nodeManager.processHeartbeat(datanodeDetails);
@@ -163,8 +160,8 @@ public class TestNodeManager {
//TODO: wait for heartbeat to be processed
Thread.sleep(4 * 1000);
assertTrue("Heartbeat thread should have picked up the" +
- "scheduled heartbeats and transitioned out of chill mode.",
- nodeManager.isOutOfChillMode());
+ "scheduled heartbeats.",
+ nodeManager.getAllNodes().size() == registeredNodes);
}
}
@@ -182,60 +179,8 @@ public class TestNodeManager {
try (SCMNodeManager nodeManager = createNodeManager(getConf())) {
//TODO: wait for heartbeat to be processed
Thread.sleep(4 * 1000);
- assertFalse("No heartbeats, Node manager should have been in" +
- " chill mode.", nodeManager.isOutOfChillMode());
- }
- }
-
- /**
- * Asserts that if we don't get enough unique nodes we stay in chillmode.
- *
- * @throws IOException
- * @throws InterruptedException
- * @throws TimeoutException
- */
- @Test
- public void testScmNotEnoughHeartbeats() throws IOException,
- InterruptedException, TimeoutException {
- try (SCMNodeManager nodeManager = createNodeManager(getConf())) {
-
- // Need 100 nodes to come out of chill mode, only one node is sending HB.
- nodeManager.setMinimumChillModeNodes(100);
- nodeManager.processHeartbeat(TestUtils
- .createRandomDatanodeAndRegister(nodeManager));
- //TODO: wait for heartbeat to be processed
- Thread.sleep(4 * 1000);
- assertFalse("Not enough heartbeat, Node manager should have" +
- "been in chillmode.", nodeManager.isOutOfChillMode());
- }
- }
-
- /**
- * Asserts that many heartbeat from the same node is counted as a single
- * node.
- *
- * @throws IOException
- * @throws InterruptedException
- * @throws TimeoutException
- */
- @Test
- public void testScmSameNodeHeartbeats() throws IOException,
- InterruptedException, TimeoutException {
-
- try (SCMNodeManager nodeManager = createNodeManager(getConf())) {
- nodeManager.setMinimumChillModeNodes(3);
- DatanodeDetails datanodeDetails = TestUtils
- .createRandomDatanodeAndRegister(nodeManager);
-
- // Send 10 heartbeat from same node, and assert we never leave chill mode.
- for (int x = 0; x < 10; x++) {
- nodeManager.processHeartbeat(datanodeDetails);
- }
-
- //TODO: wait for heartbeat to be processed
- Thread.sleep(4 * 1000);
- assertFalse("Not enough nodes have send heartbeat to node" +
- "manager.", nodeManager.isOutOfChillMode());
+ assertTrue("No heartbeats, 0 nodes should be registered",
+ nodeManager.getAllNodes().size() == 0);
}
}
@@ -872,62 +817,6 @@ public class TestNodeManager {
}
}
-
- @Test
- public void testScmEnterAndExitChillMode() throws IOException,
- InterruptedException {
- OzoneConfiguration conf = getConf();
- conf.setTimeDuration(OZONE_SCM_HEARTBEAT_PROCESS_INTERVAL, 100,
- MILLISECONDS);
-
- try (SCMNodeManager nodeManager = createNodeManager(conf)) {
- nodeManager.setMinimumChillModeNodes(10);
- DatanodeDetails datanodeDetails = TestUtils
- .createRandomDatanodeAndRegister(nodeManager);
- nodeManager.processHeartbeat(datanodeDetails);
- String status = nodeManager.getChillModeStatus();
- Assert.assertThat(status, containsString("Still in chill " +
- "mode, waiting on nodes to report in."));
-
- // Should not exit chill mode since 10 nodes have not heartbeat yet.
- assertFalse(nodeManager.isOutOfChillMode());
-
- // Force exit chill mode.
- nodeManager.forceExitChillMode();
- assertTrue(nodeManager.isOutOfChillMode());
- status = nodeManager.getChillModeStatus();
- Assert.assertThat(status,
- containsString("Out of chill mode."));
-
-
- // Enter back to into chill mode.
- nodeManager.enterChillMode();
- assertFalse(nodeManager.isOutOfChillMode());
- status = nodeManager.getChillModeStatus();
- Assert.assertThat(status,
- containsString("Out of startup chill mode," +
- " but in manual chill mode."));
-
- // Assert that node manager force enter cannot be overridden by nodes HBs.
- for (int x = 0; x < 20; x++) {
- DatanodeDetails datanode = TestUtils
- .createRandomDatanodeAndRegister(nodeManager);
- nodeManager.processHeartbeat(datanode);
- }
-
- Thread.sleep(500);
- assertFalse(nodeManager.isOutOfChillMode());
-
- // Make sure that once we exit out of manual chill mode, we fall back
- // to the number of nodes to get out chill mode.
- nodeManager.exitChillMode();
- assertTrue(nodeManager.isOutOfChillMode());
- status = nodeManager.getChillModeStatus();
- Assert.assertThat(status,
- containsString("Out of chill mode."));
- }
- }
-
/**
* Test multiple nodes sending initial heartbeat with their node report.
*
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f4009aef/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/container/testutils/ReplicationNodeManagerMock.java
----------------------------------------------------------------------
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/container/testutils/ReplicationNodeManagerMock.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/container/testutils/ReplicationNodeManagerMock.java
index 74c3932..6584aec 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/container/testutils/ReplicationNodeManagerMock.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/container/testutils/ReplicationNodeManagerMock.java
@@ -66,26 +66,6 @@ public class ReplicationNodeManagerMock implements NodeManager {
}
/**
- * Get the minimum number of nodes to get out of chill mode.
- *
- * @return int
- */
- @Override
- public int getMinimumChillModeNodes() {
- return 0;
- }
-
- /**
- * Returns a chill mode status string.
- *
- * @return String
- */
- @Override
- public String getChillModeStatus() {
- return null;
- }
-
- /**
* Get the number of data nodes that in all states.
*
* @return A state to number of nodes that in this state mapping
@@ -141,44 +121,6 @@ public class ReplicationNodeManagerMock implements NodeManager {
}
/**
- * Chill mode is the period when node manager waits for a minimum
- * configured number of datanodes to report in. This is called chill mode
- * to indicate the period before node manager gets into action.
- * <p>
- * Forcefully exits the chill mode, even if we have not met the minimum
- * criteria of the nodes reporting in.
- */
- @Override
- public void forceExitChillMode() {
-
- }
-
- /**
- * Puts the node manager into manual chill mode.
- */
- @Override
- public void enterChillMode() {
-
- }
-
- /**
- * Brings node manager out of manual chill mode.
- */
- @Override
- public void exitChillMode() {
-
- }
-
- /**
- * Returns true if node manager is out of chill mode, else false.
- * @return true if out of chill mode, else false
- */
- @Override
- public boolean isOutOfChillMode() {
- return !nodeStateMap.isEmpty();
- }
-
- /**
* Returns the aggregated node stats.
*
* @return the aggregated node stats.
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f4009aef/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerStateManagerIntegration.java
----------------------------------------------------------------------
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerStateManagerIntegration.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerStateManagerIntegration.java
index 422a7de..a8f7e01 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerStateManagerIntegration.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerStateManagerIntegration.java
@@ -66,6 +66,7 @@ public class TestContainerStateManagerIntegration {
conf = new OzoneConfiguration();
cluster = MiniOzoneCluster.newBuilder(conf).setNumDatanodes(1).build();
cluster.waitForClusterToBeReady();
+ cluster.waitTobeOutOfChillMode();
xceiverClientManager = new XceiverClientManager(conf);
scm = cluster.getStorageContainerManager();
scmContainerMapping = (ContainerMapping) scm.getScmContainerManager();
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f4009aef/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneClusterImpl.java
----------------------------------------------------------------------
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneClusterImpl.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneClusterImpl.java
index b34a7d1..71a4bef 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneClusterImpl.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneClusterImpl.java
@@ -135,12 +135,12 @@ public final class MiniOzoneClusterImpl implements MiniOzoneCluster {
public void waitTobeOutOfChillMode()
throws TimeoutException, InterruptedException {
GenericTestUtils.waitFor(() -> {
- if (scm.getScmNodeManager().isOutOfChillMode()) {
+ if (!scm.isInChillMode()) {
return true;
}
LOG.info("Waiting for cluster to be ready. No datanodes found");
return false;
- }, 100, 45000);
+ }, 100, 1000 * 45);
}
@Override
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f4009aef/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestSCMMXBean.java
----------------------------------------------------------------------
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestSCMMXBean.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestSCMMXBean.java
index 372fd3d..3136df2 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestSCMMXBean.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestSCMMXBean.java
@@ -24,15 +24,9 @@ import org.apache.hadoop.hdds.scm.server.StorageContainerManager;
import org.apache.hadoop.ozone.MiniOzoneCluster;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.scm.container.placement.metrics.ContainerStat;
-import org.apache.hadoop.hdds.scm.node.NodeManager;
import org.junit.BeforeClass;
import org.junit.AfterClass;
import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
import javax.management.MBeanServer;
import javax.management.ObjectName;
import java.io.IOException;
@@ -45,6 +39,10 @@ import java.util.concurrent.TimeoutException;
import javax.management.openmbean.CompositeData;
import javax.management.openmbean.TabularData;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
*
* This class is to test JMX management interface for scm information.
@@ -110,30 +108,14 @@ public class TestSCMMXBean {
assertEquals("nodeID", key);
assertEquals(stat.toJsonString(), value);
}
- }
-
- @Test
- public void testSCMNodeManagerMXBean() throws Exception {
- final NodeManager scmNm = scm.getScmNodeManager();
- ObjectName bean = new ObjectName(
- "Hadoop:service=SCMNodeManager,name=SCMNodeManagerInfo");
-
- Integer minChillNodes = (Integer)mbs.getAttribute(bean,
- "MinimumChillModeNodes");
- assertEquals(scmNm.getMinimumChillModeNodes(),
- minChillNodes.intValue());
-
- boolean isOutOfChillMode = (boolean)mbs.getAttribute(bean,
- "OutOfChillMode");
- assertEquals(scmNm.isOutOfChillMode(), isOutOfChillMode);
- String chillStatus = (String)mbs.getAttribute(bean,
- "ChillModeStatus");
- assertEquals(scmNm.getChillModeStatus(), chillStatus);
+ boolean inChillMode = (boolean) mbs.getAttribute(bean,
+ "InChillMode");
+ assertEquals(scm.isInChillMode(), inChillMode);
- TabularData nodeCountObj = (TabularData)mbs.getAttribute(bean,
- "NodeCount");
- verifyEquals(nodeCountObj, scm.getScmNodeManager().getNodeCount());
+ double containerThreshold = (double) mbs.getAttribute(bean,
+ "ChillModeCurrentContainerThreshold");
+ assertEquals(scm.getCurrentContainerThreshold(), containerThreshold, 0);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[2/5] hadoop git commit: HDDS-448. Move NodeStat to NodeStatemanager
from SCMNodeManager. Contributed by LiXin Ge.
Posted by na...@apache.org.
HDDS-448. Move NodeStat to NodeStatemanager from SCMNodeManager. Contributed by LiXin Ge.
(cherry picked from commit 3c798c1e3c75a7d689a42ab01a649f93643239fa)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/90dfb2f0
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/90dfb2f0
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/90dfb2f0
Branch: refs/heads/ozone-0.2
Commit: 90dfb2f06ea55ad9a237226def7c04ddd6b7e223
Parents: 50504f3
Author: Ajay Kumar <aj...@apache.com>
Authored: Fri Sep 28 10:33:17 2018 -0700
Committer: Nanda kumar <na...@apache.org>
Committed: Wed Oct 3 15:21:29 2018 +0530
----------------------------------------------------------------------
.../placement/algorithms/SCMCommonPolicy.java | 4 +-
.../placement/metrics/SCMNodeMetric.java | 1 +
.../hadoop/hdds/scm/node/NodeManager.java | 3 +-
.../hadoop/hdds/scm/node/NodeStateManager.java | 54 ++++++++++++++--
.../hadoop/hdds/scm/node/SCMNodeManager.java | 49 ++++++++------
.../hdds/scm/node/states/NodeStateMap.java | 68 ++++++++++++++++++--
.../hdds/scm/container/MockNodeManager.java | 9 ++-
.../hdds/scm/node/TestNodeReportHandler.java | 5 +-
.../testutils/ReplicationNodeManagerMock.java | 3 +-
9 files changed, 155 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/90dfb2f0/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/SCMCommonPolicy.java
----------------------------------------------------------------------
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/SCMCommonPolicy.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/SCMCommonPolicy.java
index ba241dc..60861b7 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/SCMCommonPolicy.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/SCMCommonPolicy.java
@@ -150,8 +150,8 @@ public abstract class SCMCommonPolicy implements ContainerPlacementPolicy {
private boolean hasEnoughSpace(DatanodeDetails datanodeDetails,
long sizeRequired) {
SCMNodeMetric nodeMetric = nodeManager.getNodeStat(datanodeDetails);
- return (nodeMetric != null) && nodeMetric.get().getRemaining()
- .hasResources(sizeRequired);
+ return (nodeMetric != null) && (nodeMetric.get() != null)
+ && nodeMetric.get().getRemaining().hasResources(sizeRequired);
}
/**
http://git-wip-us.apache.org/repos/asf/hadoop/blob/90dfb2f0/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/placement/metrics/SCMNodeMetric.java
----------------------------------------------------------------------
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/placement/metrics/SCMNodeMetric.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/placement/metrics/SCMNodeMetric.java
index b50376d..efd5fd6 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/placement/metrics/SCMNodeMetric.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/placement/metrics/SCMNodeMetric.java
@@ -55,6 +55,7 @@ public class SCMNodeMetric implements DatanodeMetric<SCMNodeStat, Long> {
*/
@Override
public boolean isGreater(SCMNodeStat o) {
+ Preconditions.checkNotNull(this.stat, "Argument cannot be null");
Preconditions.checkNotNull(o, "Argument cannot be null");
// if zero, replace with 1 for the division to work.
http://git-wip-us.apache.org/repos/asf/hadoop/blob/90dfb2f0/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeManager.java
----------------------------------------------------------------------
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeManager.java
index fc73253..fad3ee3 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeManager.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeManager.java
@@ -121,7 +121,8 @@ public interface NodeManager extends StorageContainerNodeProtocol,
/**
* Return the node stat of the specified datanode.
* @param datanodeDetails DatanodeDetails.
- * @return node stat if it is live/stale, null if it is dead or does't exist.
+ * @return node stat if it is live/stale, null if it is decommissioned or
+ * doesn't exist.
*/
SCMNodeMetric getNodeStat(DatanodeDetails datanodeDetails);
http://git-wip-us.apache.org/repos/asf/hadoop/blob/90dfb2f0/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeStateManager.java
----------------------------------------------------------------------
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeStateManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeStateManager.java
index 77f939e..1f99ffe 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeStateManager.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeStateManager.java
@@ -24,6 +24,7 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos.NodeState;
import org.apache.hadoop.hdds.scm.HddsServerUtil;
+import org.apache.hadoop.hdds.scm.container.placement.metrics.SCMNodeStat;
import org.apache.hadoop.hdds.scm.events.SCMEvents;
import org.apache.hadoop.hdds.scm.node.states.NodeAlreadyExistsException;
import org.apache.hadoop.hdds.scm.node.states.NodeNotFoundException;
@@ -39,13 +40,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.Closeable;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
+import java.util.*;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.function.Predicate;
@@ -417,6 +412,51 @@ public class NodeStateManager implements Runnable, Closeable {
}
/**
+ * Returns the current stats of the node.
+ *
+ * @param uuid node id
+ *
+ * @return SCMNodeStat
+ *
+ * @throws NodeNotFoundException if the node is not present
+ */
+ public SCMNodeStat getNodeStat(UUID uuid) throws NodeNotFoundException {
+ return nodeStateMap.getNodeStat(uuid);
+ }
+
+ /**
+ * Returns a unmodifiable copy of nodeStats.
+ * @return map with node stats.
+ */
+ public Map<UUID, SCMNodeStat> getNodeStatsMap() {
+ return nodeStateMap.getNodeStats();
+ }
+
+ /**
+ * Set the stat for the node.
+ *
+ * @param uuid node id.
+ *
+ * @param newstat new stat that will set to the specify node.
+ */
+ public void setNodeStat(UUID uuid, SCMNodeStat newstat) {
+ nodeStateMap.setNodeStat(uuid, newstat);
+ }
+
+ /**
+ * Remove the current stats of the specify node.
+ *
+ * @param uuid node id
+ *
+ * @return SCMNodeStat the stat removed from the node.
+ *
+ * @throws NodeNotFoundException if the node is not present.
+ */
+ public SCMNodeStat removeNodeStat(UUID uuid) throws NodeNotFoundException {
+ return nodeStateMap.removeNodeStat(uuid);
+ }
+
+ /**
* Move Stale or Dead node to healthy if we got a heartbeat from them.
* Move healthy nodes to stale nodes if it is needed.
* Move Stales node to dead if needed.
http://git-wip-us.apache.org/repos/asf/hadoop/blob/90dfb2f0/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java
----------------------------------------------------------------------
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java
index fd5f5de..620c816 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java
@@ -56,12 +56,10 @@ import org.slf4j.LoggerFactory;
import javax.management.ObjectName;
import java.io.IOException;
import java.net.InetAddress;
-import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
/**
@@ -85,11 +83,7 @@ public class SCMNodeManager
static final Logger LOG =
LoggerFactory.getLogger(SCMNodeManager.class);
-
private final NodeStateManager nodeStateManager;
- // Individual live node stats
- // TODO: NodeStat should be moved to NodeStatemanager (NodeStateMap)
- private final ConcurrentHashMap<UUID, SCMNodeStat> nodeStats;
// Should we maintain aggregated stats? If this is not frequently used, we
// can always calculate it from nodeStats whenever required.
// Aggregated node stats
@@ -124,7 +118,6 @@ public class SCMNodeManager
StorageContainerManager scmManager, EventPublisher eventPublisher)
throws IOException {
this.nodeStateManager = new NodeStateManager(conf, eventPublisher);
- this.nodeStats = new ConcurrentHashMap<>();
this.scmStat = new SCMNodeStat();
this.clusterID = clusterID;
this.version = VersionInfo.getLatestVersion();
@@ -297,8 +290,10 @@ public class SCMNodeManager
private void updateNodeStat(UUID dnId, NodeReportProto nodeReport) {
- SCMNodeStat stat = nodeStats.get(dnId);
- if (stat == null) {
+ SCMNodeStat stat;
+ try {
+ stat = nodeStateManager.getNodeStat(dnId);
+ } catch (NodeNotFoundException e) {
LOG.debug("SCM updateNodeStat based on heartbeat from previous" +
"dead datanode {}", dnId);
stat = new SCMNodeStat();
@@ -317,9 +312,9 @@ public class SCMNodeManager
}
scmStat.subtract(stat);
stat.set(totalCapacity, totalScmUsed, totalRemaining);
- nodeStats.put(dnId, stat);
scmStat.add(stat);
}
+ nodeStateManager.setNodeStat(dnId, stat);
}
/**
@@ -377,7 +372,7 @@ public class SCMNodeManager
UUID dnId = datanodeDetails.getUuid();
try {
nodeStateManager.addNode(datanodeDetails);
- nodeStats.put(dnId, new SCMNodeStat());
+ nodeStateManager.setNodeStat(dnId, new SCMNodeStat());
if(inStartupChillMode.get() &&
nodeStateManager.getTotalNodeCount() >= getMinimumChillModeNodes()) {
inStartupChillMode.getAndSet(false);
@@ -446,17 +441,25 @@ public class SCMNodeManager
*/
@Override
public Map<UUID, SCMNodeStat> getNodeStats() {
- return Collections.unmodifiableMap(nodeStats);
+ return nodeStateManager.getNodeStatsMap();
}
/**
* Return the node stat of the specified datanode.
* @param datanodeDetails - datanode ID.
- * @return node stat if it is live/stale, null if it is dead or does't exist.
+ * @return node stat if it is live/stale, null if it is decommissioned or
+ * doesn't exist.
*/
@Override
public SCMNodeMetric getNodeStat(DatanodeDetails datanodeDetails) {
- return new SCMNodeMetric(nodeStats.get(datanodeDetails.getUuid()));
+ try {
+ return new SCMNodeMetric(
+ nodeStateManager.getNodeStat(datanodeDetails.getUuid()));
+ } catch (NodeNotFoundException e) {
+ LOG.info("SCM getNodeStat from a decommissioned or removed datanode {}",
+ datanodeDetails.getUuid());
+ return null;
+ }
}
@Override
@@ -492,18 +495,22 @@ public class SCMNodeManager
}
/**
- * Remove the node stats and update the storage stats
- * in this SCM Node Manager.
+ * Update the node stats and cluster storage stats in this SCM Node Manager.
*
* @param dnUuid datanode uuid.
*/
@Override
public void processDeadNode(UUID dnUuid) {
- SCMNodeStat stat = nodeStats.get(dnUuid);
- LOG.trace("Update stat values as Datanode {} is dead.", dnUuid);
- if (stat != null) {
- scmStat.subtract(stat);
- stat.set(0, 0, 0);
+ try {
+ SCMNodeStat stat = nodeStateManager.getNodeStat(dnUuid);
+ if (stat != null) {
+ LOG.trace("Update stat values as Datanode {} is dead.", dnUuid);
+ scmStat.subtract(stat);
+ stat.set(0, 0, 0);
+ }
+ } catch (NodeNotFoundException e) {
+ LOG.warn("Can't update stats based on message of dead Datanode {}, it"
+ + " doesn't exist or decommissioned already.", dnUuid);
}
}
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/90dfb2f0/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/states/NodeStateMap.java
----------------------------------------------------------------------
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/states/NodeStateMap.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/states/NodeStateMap.java
index dd91866..774ced1 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/states/NodeStateMap.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/states/NodeStateMap.java
@@ -20,14 +20,10 @@ package org.apache.hadoop.hdds.scm.node.states;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos.NodeState;
+import org.apache.hadoop.hdds.scm.container.placement.metrics.SCMNodeStat;
import org.apache.hadoop.hdds.scm.node.DatanodeInfo;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
+import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -48,6 +44,11 @@ public class NodeStateMap {
* Represents the current state of node.
*/
private final ConcurrentHashMap<NodeState, Set<UUID>> stateMap;
+ /**
+ * Represents the current stats of node.
+ */
+ private final ConcurrentHashMap<UUID, SCMNodeStat> nodeStats;
+
private final ReadWriteLock lock;
/**
@@ -57,6 +58,7 @@ public class NodeStateMap {
lock = new ReentrantReadWriteLock();
nodeMap = new ConcurrentHashMap<>();
stateMap = new ConcurrentHashMap<>();
+ nodeStats = new ConcurrentHashMap<>();
initStateMap();
}
@@ -260,6 +262,60 @@ public class NodeStateMap {
}
/**
+ * Returns the current stats of the node.
+ *
+ * @param uuid node id
+ *
+ * @return SCMNodeStat of the specify node.
+ *
+ * @throws NodeNotFoundException if the node is not found
+ */
+ public SCMNodeStat getNodeStat(UUID uuid) throws NodeNotFoundException {
+ SCMNodeStat stat = nodeStats.get(uuid);
+ if (stat == null) {
+ throw new NodeNotFoundException("Node UUID: " + uuid);
+ }
+ return stat;
+ }
+
+ /**
+ * Returns a unmodifiable copy of nodeStats.
+ *
+ * @return map with node stats.
+ */
+ public Map<UUID, SCMNodeStat> getNodeStats() {
+ return Collections.unmodifiableMap(nodeStats);
+ }
+
+ /**
+ * Set the current stats of the node.
+ *
+ * @param uuid node id
+ *
+ * @param newstat stat that will set to the specify node.
+ */
+ public void setNodeStat(UUID uuid, SCMNodeStat newstat) {
+ nodeStats.put(uuid, newstat);
+ }
+
+ /**
+ * Remove the current stats of the specify node.
+ *
+ * @param uuid node id
+ *
+ * @return SCMNodeStat the stat removed from the node.
+ *
+ * @throws NodeNotFoundException if the node is not found
+ */
+ public SCMNodeStat removeNodeStat(UUID uuid) throws NodeNotFoundException {
+ SCMNodeStat stat = nodeStats.remove(uuid);
+ if (stat == null) {
+ throw new NodeNotFoundException("Node UUID: " + uuid);
+ }
+ return stat;
+ }
+
+ /**
* Since we don't hold a global lock while constructing this string,
* the result might be inconsistent. If someone has changed the state of node
* while we are constructing the string, the result will be inconsistent.
http://git-wip-us.apache.org/repos/asf/hadoop/blob/90dfb2f0/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java
----------------------------------------------------------------------
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java
index 5173b23..0d90728 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java
@@ -266,11 +266,16 @@ public class MockNodeManager implements NodeManager {
/**
* Return the node stat of the specified datanode.
* @param datanodeDetails - datanode details.
- * @return node stat if it is live/stale, null if it is dead or does't exist.
+ * @return node stat if it is live/stale, null if it is decommissioned or
+ * doesn't exist.
*/
@Override
public SCMNodeMetric getNodeStat(DatanodeDetails datanodeDetails) {
- return new SCMNodeMetric(nodeMetricMap.get(datanodeDetails.getUuid()));
+ SCMNodeStat stat = nodeMetricMap.get(datanodeDetails.getUuid());
+ if (stat == null) {
+ return null;
+ }
+ return new SCMNodeMetric(stat);
}
/**
http://git-wip-us.apache.org/repos/asf/hadoop/blob/90dfb2f0/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestNodeReportHandler.java
----------------------------------------------------------------------
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestNodeReportHandler.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestNodeReportHandler.java
index e50b823..f9b1392 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestNodeReportHandler.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestNodeReportHandler.java
@@ -57,9 +57,12 @@ public class TestNodeReportHandler implements EventPublisher {
StorageReportProto storageOne = TestUtils
.createStorageReport(dn.getUuid(), storagePath, 100, 10, 90, null);
+ SCMNodeMetric nodeMetric = nodeManager.getNodeStat(dn);
+ Assert.assertNull(nodeMetric);
+
nodeReportHandler.onMessage(
getNodeReport(dn, storageOne), this);
- SCMNodeMetric nodeMetric = nodeManager.getNodeStat(dn);
+ nodeMetric = nodeManager.getNodeStat(dn);
Assert.assertTrue(nodeMetric.get().getCapacity().get() == 100);
Assert.assertTrue(nodeMetric.get().getRemaining().get() == 90);
http://git-wip-us.apache.org/repos/asf/hadoop/blob/90dfb2f0/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/container/testutils/ReplicationNodeManagerMock.java
----------------------------------------------------------------------
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/container/testutils/ReplicationNodeManagerMock.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/container/testutils/ReplicationNodeManagerMock.java
index 4238703..a9a00ef 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/container/testutils/ReplicationNodeManagerMock.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/container/testutils/ReplicationNodeManagerMock.java
@@ -196,7 +196,8 @@ public class ReplicationNodeManagerMock implements NodeManager {
* Return the node stat of the specified datanode.
*
* @param dd - datanode details.
- * @return node stat if it is live/stale, null if it is dead or does't exist.
+ * @return node stat if it is live/stale, null if it is decommissioned or
+ * doesn't exist.
*/
@Override
public SCMNodeMetric getNodeStat(DatanodeDetails dd) {
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[3/5] hadoop git commit: HDDS-557. DeadNodeHandler should handle
exception from removeContainerHandler api. Contributed by Ajay Kumar.
Posted by na...@apache.org.
HDDS-557. DeadNodeHandler should handle exception from removeContainerHandler api. Contributed by Ajay Kumar.
(cherry picked from commit cc80ac23156e1e91c1f77df65fa53504fbb34141)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/71566354
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/71566354
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/71566354
Branch: refs/heads/ozone-0.2
Commit: 71566354202cce51bd814184632b114255afba84
Parents: 90dfb2f
Author: Ajay Kumar <aj...@apache.com>
Authored: Mon Oct 1 11:21:26 2018 -0700
Committer: Nanda kumar <na...@apache.org>
Committed: Wed Oct 3 15:24:08 2018 +0530
----------------------------------------------------------------------
.../hadoop/hdds/scm/node/DeadNodeHandler.java | 16 ++++++++++++--
.../hdds/scm/node/TestDeadNodeHandler.java | 23 ++++++++++++++++++++
2 files changed, 37 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/71566354/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/DeadNodeHandler.java
----------------------------------------------------------------------
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/DeadNodeHandler.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/DeadNodeHandler.java
index 88f5df7..253b3ec 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/DeadNodeHandler.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/DeadNodeHandler.java
@@ -72,8 +72,13 @@ public class DeadNodeHandler implements EventHandler<DatanodeDetails> {
datanodeDetails.getUuid());
for (ContainerID container : containers) {
try {
- containerStateManager.removeContainerReplica(container,
- datanodeDetails);
+ try {
+ containerStateManager.removeContainerReplica(container,
+ datanodeDetails);
+ } catch (SCMException ex) {
+ LOG.info("DataNode {} doesn't have replica for container {}.",
+ datanodeDetails.getUuid(), container.getId());
+ }
if (!containerStateManager.isOpen(container)) {
ReplicationRequest replicationRequest =
@@ -90,4 +95,11 @@ public class DeadNodeHandler implements EventHandler<DatanodeDetails> {
}
}
}
+
+ /**
+ * Returns logger.
+ * */
+ public static Logger getLogger() {
+ return LOG;
+ }
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/71566354/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestDeadNodeHandler.java
----------------------------------------------------------------------
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestDeadNodeHandler.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestDeadNodeHandler.java
index 698332e..6966322 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestDeadNodeHandler.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestDeadNodeHandler.java
@@ -196,6 +196,29 @@ public class TestDeadNodeHandler {
Assert.assertTrue(nodeStat.get().getScmUsed().get() == 0);
}
+ @Test
+ public void testOnMessageReplicaFailure() throws Exception {
+ DatanodeDetails dn1 = TestUtils.randomDatanodeDetails();
+ GenericTestUtils.LogCapturer logCapturer = GenericTestUtils.LogCapturer
+ .captureLogs(DeadNodeHandler.getLogger());
+ String storagePath1 = GenericTestUtils.getRandomizedTempPath()
+ .concat("/" + dn1.getUuidString());
+
+ StorageReportProto storageOne = TestUtils.createStorageReport(
+ dn1.getUuid(), storagePath1, 100, 10, 90, null);
+ nodeReportHandler.onMessage(getNodeReport(dn1, storageOne),
+ Mockito.mock(EventPublisher.class));
+
+ ContainerInfo container1 =
+ TestUtils.allocateContainer(containerStateManager);
+ registerReplicas(node2ContainerMap, dn1, container1);
+
+ deadNodeHandler.onMessage(dn1, eventQueue);
+ Assert.assertTrue(logCapturer.getOutput().contains(
+ "DataNode " + dn1.getUuid() + " doesn't have replica for container "
+ + container1.getContainerID()));
+ }
+
private void registerReplicas(ContainerStateManager csm,
ContainerInfo container, DatanodeDetails... datanodes) {
csm.getContainerStateMap()
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org