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 sz...@apache.org on 2018/04/03 18:33:52 UTC
hadoop git commit: YARN-8035. Uncaught exception in
ContainersMonitorImpl during relaunch due to the process ID changing.
Contributed by Shane Kumpf.
Repository: hadoop
Updated Branches:
refs/heads/trunk 5a174f8ac -> 2d06d885c
YARN-8035. Uncaught exception in ContainersMonitorImpl during relaunch due to the process ID changing. Contributed by Shane Kumpf.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2d06d885
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2d06d885
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2d06d885
Branch: refs/heads/trunk
Commit: 2d06d885c84b2e4a3acb6d3e0c50d4870e37ca82
Parents: 5a174f8
Author: Miklos Szegedi <sz...@apache.org>
Authored: Tue Apr 3 10:01:00 2018 -0700
Committer: Miklos Szegedi <sz...@apache.org>
Committed: Tue Apr 3 10:01:00 2018 -0700
----------------------------------------------------------------------
.../containermanager/monitor/ContainerMetrics.java | 2 +-
.../monitor/TestContainerMetrics.java | 17 +++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/2d06d885/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/monitor/ContainerMetrics.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/monitor/ContainerMetrics.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/monitor/ContainerMetrics.java
index a6aa337..2a95849 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/monitor/ContainerMetrics.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/monitor/ContainerMetrics.java
@@ -274,7 +274,7 @@ public class ContainerMetrics implements MetricsSource {
}
public void recordProcessId(String processId) {
- registry.tag(PROCESSID_INFO, processId);
+ registry.tag(PROCESSID_INFO, processId, true);
}
public void recordResourceLimit(int vmemLimit, int pmemLimit, int cpuVcores) {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/2d06d885/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/monitor/TestContainerMetrics.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/monitor/TestContainerMetrics.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/monitor/TestContainerMetrics.java
index 1840d62..8b2bff1 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/monitor/TestContainerMetrics.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/monitor/TestContainerMetrics.java
@@ -206,4 +206,21 @@ public class TestContainerMetrics {
}
Assert.assertEquals(expectedValues.keySet(), testResults);
}
+
+ @Test
+ public void testContainerMetricsUpdateContainerPid() {
+ ContainerId containerId = mock(ContainerId.class);
+ ContainerMetrics metrics = ContainerMetrics.forContainer(containerId,
+ 100, 1);
+
+ String origPid = "1234";
+ metrics.recordProcessId(origPid);
+ assertEquals(origPid, metrics.registry.getTag(
+ ContainerMetrics.PROCESSID_INFO.name()).value());
+
+ String newPid = "4321";
+ metrics.recordProcessId(newPid);
+ assertEquals(newPid, metrics.registry.getTag(
+ ContainerMetrics.PROCESSID_INFO.name()).value());
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org