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 zt...@apache.org on 2019/06/18 05:26:09 UTC
[hadoop] branch branch-3.1.2 updated: YARN-9584. Should put
initializeProcessTrees method call before get pid. Contributed by Wanqiang
Ji.
This is an automated email from the ASF dual-hosted git repository.
ztang pushed a commit to branch branch-3.1.2
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.1.2 by this push:
new b7d2135 YARN-9584. Should put initializeProcessTrees method call before get pid. Contributed by Wanqiang Ji.
b7d2135 is described below
commit b7d2135f6f5cea7cf5d5fc5a2090fc5d8596969e
Author: Zhankun Tang <zt...@apache.org>
AuthorDate: Tue Jun 18 12:23:52 2019 +0800
YARN-9584. Should put initializeProcessTrees method call before get pid. Contributed by Wanqiang Ji.
(cherry picked from commit 67414a1a80039e70e0afc1de171831a6e981f37a)
---
.../nodemanager/containermanager/monitor/ContainersMonitorImpl.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
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/ContainersMonitorImpl.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/ContainersMonitorImpl.java
index 1007750..6db5542 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/ContainersMonitorImpl.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/ContainersMonitorImpl.java
@@ -441,11 +441,10 @@ public class ContainersMonitorImpl extends AbstractService implements
ContainerId containerId = entry.getKey();
ProcessTreeInfo ptInfo = entry.getValue();
try {
- String pId = ptInfo.getPID();
-
// Initialize uninitialized process trees
initializeProcessTrees(entry);
+ String pId = ptInfo.getPID();
if (pId == null || !isResourceCalculatorAvailable()) {
continue; // processTree cannot be tracked
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org