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

YARN-7849. TestMiniYarnClusterNodeUtilization#testUpdateNodeUtilization fails due to heartbeat sync error. Contributed by Botong Huang

Browse Source
This commit is contained in:
Jason Lowe 2018-02-05 17:16:04 -06:00
parent 33e6cdbd16
commit 60656bceca
2 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java
View File

@ -653,9 +653,8 @@ protected NodeStatus getSimulatedNodeStatus(NodeStatus currentStatus) {
if(nodeStatus == null) { if(nodeStatus == null) {
return currentStatus; return currentStatus;
} else { } else {
// Increment response ID, the RMNodeStatusEvent will not get recorded // Use the same responseId for the custom node status
// for a duplicate heartbeat nodeStatus.setResponseId(currentStatus.getResponseId());
nodeStatus.setResponseId(nodeStatus.getResponseId() + 1);
return nodeStatus; return nodeStatus;
} }
} }

20
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestMiniYarnClusterNodeUtilization.java
View File

@ -32,9 +32,6 @@
import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.conf.YarnConfiguration;
import org.apache.hadoop.yarn.exceptions.YarnException; import org.apache.hadoop.yarn.exceptions.YarnException;
import org.apache.hadoop.yarn.server.MiniYARNCluster.CustomNodeManager; import org.apache.hadoop.yarn.server.MiniYARNCluster.CustomNodeManager;
import org.apache.hadoop.yarn.server.api.ResourceTracker;
import org.apache.hadoop.yarn.server.api.ServerRMProxy;
import org.apache.hadoop.yarn.server.api.protocolrecords.NodeHeartbeatRequest;
import org.apache.hadoop.yarn.server.api.records.NodeHealthStatus; import org.apache.hadoop.yarn.server.api.records.NodeHealthStatus;
import org.apache.hadoop.yarn.server.api.records.NodeStatus; import org.apache.hadoop.yarn.server.api.records.NodeStatus;
import org.apache.hadoop.yarn.server.nodemanager.NodeStatusUpdater; import org.apache.hadoop.yarn.server.nodemanager.NodeStatusUpdater;
@ -87,8 +84,7 @@ public void setup() {
assertFalse("RM never turned active", -1 == cluster.getActiveRMIndex()); assertFalse("RM never turned active", -1 == cluster.getActiveRMIndex());
nm = (CustomNodeManager)cluster.getNodeManager(0); nm = (CustomNodeManager)cluster.getNodeManager(0);
int responseId = 1; nodeStatus = createNodeStatus(nm.getNMContext().getNodeId(), 0,
nodeStatus = createNodeStatus(nm.getNMContext().getNodeId(), responseId,
CONTAINER_PMEM_1, CONTAINER_VMEM_1, CONTAINER_CPU_1, CONTAINER_PMEM_1, CONTAINER_VMEM_1, CONTAINER_CPU_1,
NODE_PMEM_1, NODE_VMEM_1, NODE_CPU_1); NODE_PMEM_1, NODE_VMEM_1, NODE_CPU_1);
nm.setNodeStatus(nodeStatus); nm.setNodeStatus(nodeStatus);
@ -105,23 +101,14 @@ public void testUpdateNodeUtilization()
assertTrue("NMs fail to connect to the RM", assertTrue("NMs fail to connect to the RM",
cluster.waitForNodeManagersToConnect(10000)); cluster.waitForNodeManagersToConnect(10000));
// Simulate heartbeat using NodeStatus fixture
NodeHeartbeatRequest request =
NodeHeartbeatRequest.newInstance(nodeStatus, null, null, null);
ResourceTracker tracker =
ServerRMProxy.createRMProxy(conf, ResourceTracker.class);
tracker.nodeHeartbeat(request);
// Give the heartbeat time to propagate to the RM // Give the heartbeat time to propagate to the RM
verifySimulatedUtilization(); verifySimulatedUtilization();
// Alter utilization // Alter utilization
int responseId = 10; nodeStatus = createNodeStatus(nm.getNMContext().getNodeId(), 0,
nodeStatus = createNodeStatus(nm.getNMContext().getNodeId(), responseId,
CONTAINER_PMEM_2, CONTAINER_VMEM_2, CONTAINER_CPU_2, CONTAINER_PMEM_2, CONTAINER_VMEM_2, CONTAINER_CPU_2,
NODE_PMEM_2, NODE_VMEM_2, NODE_CPU_2); NODE_PMEM_2, NODE_VMEM_2, NODE_CPU_2);
nm.setNodeStatus(nodeStatus); nm.setNodeStatus(nodeStatus);
tracker.nodeHeartbeat(request);
// Give the heartbeat time to propagate to the RM // Give the heartbeat time to propagate to the RM
verifySimulatedUtilization(); verifySimulatedUtilization();
@ -145,8 +132,7 @@ public void testMockNodeStatusHeartbeat()
verifySimulatedUtilization(); verifySimulatedUtilization();
// Alter utilization // Alter utilization
int responseId = 20; nodeStatus = createNodeStatus(nm.getNMContext().getNodeId(), 0,
nodeStatus = createNodeStatus(nm.getNMContext().getNodeId(), responseId,
CONTAINER_PMEM_2, CONTAINER_VMEM_2, CONTAINER_CPU_2, CONTAINER_PMEM_2, CONTAINER_VMEM_2, CONTAINER_CPU_2,
NODE_PMEM_2, NODE_VMEM_2, NODE_CPU_2); NODE_PMEM_2, NODE_VMEM_2, NODE_CPU_2);
nm.setNodeStatus(nodeStatus); nm.setNodeStatus(nodeStatus);