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 su...@apache.org on 2019/02/07 13:41:25 UTC
[hadoop] branch branch-2 updated: YARN-9206. RMServerUtils does not
count SHUTDOWN as an accepted state. Contributed by Kuhu Shukla.
This is an automated email from the ASF dual-hosted git repository.
sunilg pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new a919336 YARN-9206. RMServerUtils does not count SHUTDOWN as an accepted state. Contributed by Kuhu Shukla.
a919336 is described below
commit a91933620d8755e80ad4bdf900b506dd73d26786
Author: Sunil G <su...@apache.org>
AuthorDate: Thu Feb 7 19:08:41 2019 +0530
YARN-9206. RMServerUtils does not count SHUTDOWN as an accepted state. Contributed by Kuhu Shukla.
(cherry picked from commit 6ffe6ea8999c1216b6e510e350535754431bac2d)
---
.../apache/hadoop/yarn/api/records/NodeState.java | 12 ++++++++
.../yarn/server/resourcemanager/RMServerUtils.java | 22 ++++++++-----
.../resourcemanager/webapp/RMWebServices.java | 4 +--
.../server/resourcemanager/TestRMServerUtils.java | 36 ++++++++++++++++++++++
4 files changed, 64 insertions(+), 10 deletions(-)
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/NodeState.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/NodeState.java
index d0344fb..2700cf2 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/NodeState.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/NodeState.java
@@ -55,4 +55,16 @@ public enum NodeState {
return (this == UNHEALTHY || this == DECOMMISSIONED
|| this == LOST || this == SHUTDOWN);
}
+
+ public boolean isInactiveState() {
+ return this == NodeState.DECOMMISSIONED ||
+ this == NodeState.LOST || this == NodeState.REBOOTED ||
+ this == NodeState.SHUTDOWN;
+ }
+
+ public boolean isActiveState() {
+ return this == NodeState.NEW ||
+ this == NodeState.RUNNING || this == NodeState.UNHEALTHY ||
+ this == NodeState.DECOMMISSIONING;
+ }
}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMServerUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMServerUtils.java
index 35b0c98..5b07448 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMServerUtils.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMServerUtils.java
@@ -106,10 +106,20 @@ public class RMServerUtils {
EnumSet<NodeState> acceptedStates) {
// nodes contains nodes that are NEW, RUNNING, UNHEALTHY or DECOMMISSIONING.
ArrayList<RMNode> results = new ArrayList<RMNode>();
- if (acceptedStates.contains(NodeState.NEW) ||
- acceptedStates.contains(NodeState.RUNNING) ||
- acceptedStates.contains(NodeState.DECOMMISSIONING) ||
- acceptedStates.contains(NodeState.UNHEALTHY)) {
+ boolean hasActive = false;
+ boolean hasInactive = false;
+ for (NodeState nodeState : acceptedStates) {
+ if (!hasInactive && nodeState.isInactiveState()) {
+ hasInactive = true;
+ }
+ if (!hasActive && nodeState.isActiveState()) {
+ hasActive = true;
+ }
+ if (hasActive && hasInactive) {
+ break;
+ }
+ }
+ if (hasActive) {
for (RMNode rmNode : context.getRMNodes().values()) {
if (acceptedStates.contains(rmNode.getState())) {
results.add(rmNode);
@@ -118,9 +128,7 @@ public class RMServerUtils {
}
// inactiveNodes contains nodes that are DECOMMISSIONED, LOST, OR REBOOTED
- if (acceptedStates.contains(NodeState.DECOMMISSIONED) ||
- acceptedStates.contains(NodeState.LOST) ||
- acceptedStates.contains(NodeState.REBOOTED)) {
+ if (hasInactive) {
for (RMNode rmNode : context.getInactiveRMNodes().values()) {
if ((rmNode != null) && acceptedStates.contains(rmNode.getState())) {
results.add(rmNode);
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebServices.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebServices.java
index d76a412..cded2ec 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebServices.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebServices.java
@@ -418,9 +418,7 @@ public class RMWebServices extends WebServices implements RMWebServiceProtocol {
NodesInfo nodesInfo = new NodesInfo();
for (RMNode rmNode : rmNodes) {
NodeInfo nodeInfo = new NodeInfo(rmNode, sched);
- if (EnumSet
- .of(NodeState.LOST, NodeState.DECOMMISSIONED, NodeState.REBOOTED)
- .contains(rmNode.getState())) {
+ if (rmNode.getState().isInactiveState()) {
nodeInfo.setNodeHTTPAddress(RMWSConsts.EMPTY);
}
nodesInfo.add(nodeInfo);
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMServerUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMServerUtils.java
index 078b8fd..e61d768 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMServerUtils.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMServerUtils.java
@@ -19,11 +19,13 @@
package org.apache.hadoop.yarn.server.resourcemanager;
import org.apache.hadoop.yarn.api.records.NodeId;
+import org.apache.hadoop.yarn.api.records.NodeState;
import org.apache.hadoop.yarn.api.records.Priority;
import org.apache.hadoop.yarn.api.records.Resource;
import org.apache.hadoop.yarn.api.records.ResourceRequest;
import org.apache.hadoop.yarn.conf.YarnConfiguration;
import org.apache.hadoop.yarn.server.resourcemanager.nodelabels.RMNodeLabelsManager;
+import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNode;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler;
import org.junit.Assert;
import org.junit.Test;
@@ -31,6 +33,9 @@ import org.mockito.Mockito;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.EnumSet;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -108,6 +113,37 @@ public class TestRMServerUtils {
}
@Test
+ public void testQueryRMNodes() throws Exception {
+ RMContext rmContext = Mockito.mock(RMContext.class);
+ NodeId node1 = NodeId.newInstance("node1", 1234);
+ RMNode rmNode1 = Mockito.mock(RMNode.class);
+ ConcurrentMap<NodeId, RMNode> inactiveList =
+ new ConcurrentHashMap<NodeId, RMNode>();
+ Mockito.when(rmNode1.getState()).thenReturn(NodeState.SHUTDOWN);
+ inactiveList.put(node1, rmNode1);
+ Mockito.when(rmContext.getInactiveRMNodes()).thenReturn(inactiveList);
+ List<RMNode> result = RMServerUtils.queryRMNodes(rmContext,
+ EnumSet.of(NodeState.SHUTDOWN));
+ Assert.assertTrue(result.size() != 0);
+ Assert.assertEquals(result.get(0), rmNode1);
+ Mockito.when(rmNode1.getState()).thenReturn(NodeState.DECOMMISSIONED);
+ result = RMServerUtils.queryRMNodes(rmContext,
+ EnumSet.of(NodeState.DECOMMISSIONED));
+ Assert.assertTrue(result.size() != 0);
+ Assert.assertEquals(result.get(0), rmNode1);
+ Mockito.when(rmNode1.getState()).thenReturn(NodeState.LOST);
+ result = RMServerUtils.queryRMNodes(rmContext,
+ EnumSet.of(NodeState.LOST));
+ Assert.assertTrue(result.size() != 0);
+ Assert.assertEquals(result.get(0), rmNode1);
+ Mockito.when(rmNode1.getState()).thenReturn(NodeState.REBOOTED);
+ result = RMServerUtils.queryRMNodes(rmContext,
+ EnumSet.of(NodeState.REBOOTED));
+ Assert.assertTrue(result.size() != 0);
+ Assert.assertEquals(result.get(0), rmNode1);
+ }
+
+ @Test
public void testGetApplicableNodeCountForAMLabels() throws Exception {
Set<NodeId> noLabelNodes = new HashSet<>();
for (int i = 0; i < 80; i++) {
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org