Apache/hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-9391. Fixed node manager environment leaks into Docker containers.

Browse Source 
Contributed by Jim Brennan

(cherry picked from commit 3c45762a0bfb403e069a03e30d35dd11432ee8b0)
This commit is contained in:
Eric Yang 2019-03-25 15:53:24 -04:00
parent ade3af6ef2
commit 10642a6205
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/ContainerExecutor.java
View File

@ -406,16 +406,6 @@ public void writeLaunchEnv(OutputStream out, Map<String, String> environment,
sb.env(env.getKey(), env.getValue()); sb.env(env.getKey(), env.getValue());
} }
} }
// Add the whitelist vars to the environment. Do this after writing
// environment variables so they are not written twice.
for(String var : whitelistVars) {
if (!environment.containsKey(var)) {
String val = getNMEnvVar(var);
if (val != null) {
environment.put(var, val);
}
}
}
} }
if (resources != null) { if (resources != null) {

5
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/TestContainerLaunch.java
View File

@ -468,10 +468,15 @@ protected String getNMEnvVar(String varname) {
for (String envVar : env.keySet()) { for (String envVar : env.keySet()) {
Assert.assertTrue(shellContent.contains(envVar + "=")); Assert.assertTrue(shellContent.contains(envVar + "="));
} }
// The whitelist vars should not have been added to env
// They should only be in the launch script
for (String wlVar : whitelistVars) { for (String wlVar : whitelistVars) {
Assert.assertFalse(env.containsKey(wlVar));
Assert.assertTrue(shellContent.contains(wlVar + "=")); Assert.assertTrue(shellContent.contains(wlVar + "="));
} }
// Non-whitelist nm vars should be in neither env nor in launch script
for (String nwlVar : nonWhiteListEnv) { for (String nwlVar : nonWhiteListEnv) {
Assert.assertFalse(env.containsKey(nwlVar));
Assert.assertFalse(shellContent.contains(nwlVar + "=")); Assert.assertFalse(shellContent.contains(nwlVar + "="));
} }
// Explicitly Set NM vars should be before user vars // Explicitly Set NM vars should be before user vars