This is an automated email from the ASF dual-hosted git repository.
weichiu pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 167acd8 YARN-9683. Remove reapDockerContainerNoPid left behind by
YARN-9074 (#1212) Contributed by Kevin Su.
167acd8 is described below
commit 167acd87daf61be9a27dfb5af6e7cbacb96e44de
Author: HUAN-PING SU <[email protected]>
AuthorDate: Thu Aug 15 01:42:29 2019 +0800
YARN-9683. Remove reapDockerContainerNoPid left behind by YARN-9074 (#1212)
Contributed by Kevin Su.
Reviewed-by: Eric Yang <[email protected]>
Reviewed-by: Adam Antal <[email protected]>
---
.../containermanager/launcher/ContainerCleanup.java | 14 --------------
1 file changed, 14 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/launcher/ContainerCleanup.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/ContainerCleanup.java
index e92560e..72940ec 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/ContainerCleanup.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/ContainerCleanup.java
@@ -215,18 +215,4 @@ public class ContainerCleanup implements Runnable {
new ContainerSignalContext.Builder().setContainer(container)
.setUser(user).setPid(processId).setSignal(signal).build());
}
-
- private void reapDockerContainerNoPid(String user) throws IOException {
- String containerIdStr =
- container.getContainerTokenIdentifier().getContainerID().toString();
- LOG.info("Unable to obtain pid, but docker container request detected. "
- + "Attempting to reap container " + containerIdStr);
- boolean result = exec.reapContainer(
- new ContainerReapContext.Builder()
- .setContainer(container)
- .setUser(container.getUser())
- .build());
- LOG.debug("Sent signal to docker container {} as user {}, result={}",
- containerIdStr, user, (result ? "success" : "failed"));
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
