diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java index b9afdbe..d7c857e 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java @@ -623,9 +623,8 @@ protected NodeStatus getSimulatedNodeStatus(NodeStatus currentStatus) { if(nodeStatus == null) { return currentStatus; } else { - // Increment response ID, the RMNodeStatusEvent will not get recorded - // for a duplicate heartbeat - nodeStatus.setResponseId(nodeStatus.getResponseId() + 1); + // Use the same responseId for the custom node status + nodeStatus.setResponseId(currentStatus.getResponseId()); return nodeStatus; } } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestMiniYarnClusterNodeUtilization.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestMiniYarnClusterNodeUtilization.java index a941302..c330c2a 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestMiniYarnClusterNodeUtilization.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestMiniYarnClusterNodeUtilization.java @@ -87,8 +87,7 @@ public void setup() { assertFalse("RM never turned active", -1 == cluster.getActiveRMIndex()); nm = (CustomNodeManager)cluster.getNodeManager(0); - int responseId = 1; - nodeStatus = createNodeStatus(nm.getNMContext().getNodeId(), responseId, + nodeStatus = createNodeStatus(nm.getNMContext().getNodeId(), 0, CONTAINER_PMEM_1, CONTAINER_VMEM_1, CONTAINER_CPU_1, NODE_PMEM_1, NODE_VMEM_1, NODE_CPU_1); nm.setNodeStatus(nodeStatus); @@ -116,8 +115,7 @@ public void testUpdateNodeUtilization() verifySimulatedUtilization(); // Alter utilization - int responseId = 10; - nodeStatus = createNodeStatus(nm.getNMContext().getNodeId(), responseId, + nodeStatus = createNodeStatus(nm.getNMContext().getNodeId(), 0, CONTAINER_PMEM_2, CONTAINER_VMEM_2, CONTAINER_CPU_2, NODE_PMEM_2, NODE_VMEM_2, NODE_CPU_2); nm.setNodeStatus(nodeStatus); @@ -145,8 +143,7 @@ public void testMockNodeStatusHeartbeat() verifySimulatedUtilization(); // Alter utilization - int responseId = 20; - nodeStatus = createNodeStatus(nm.getNMContext().getNodeId(), responseId, + nodeStatus = createNodeStatus(nm.getNMContext().getNodeId(), 0, CONTAINER_PMEM_2, CONTAINER_VMEM_2, CONTAINER_CPU_2, NODE_PMEM_2, NODE_VMEM_2, NODE_CPU_2); nm.setNodeStatus(nodeStatus);