Repository: hadoop
Updated Branches:
refs/heads/branch-2.9 3883ae779 -> 6d985e901
YARN-9125. Fixed Carriage Return detection in Docker container launch.
Contributed by Billie Rinaldi
(cherry picked from commit 2ffd8487b47fc32e10fe35e20209f302fde5cd5e)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6d985e90
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6d985e90
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6d985e90
Branch: refs/heads/branch-2.9
Commit: 6d985e901f5b05bad069e42a75e93070ecd19161
Parents: 3883ae7
Author: Eric Yang <[email protected]>
Authored: Mon Dec 17 12:29:49 2018 -0500
Committer: Eric Yang <[email protected]>
Committed: Mon Dec 17 12:31:24 2018 -0500
----------------------------------------------------------------------
.../containermanager/linux/runtime/docker/DockerClient.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6d985e90/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/runtime/docker/DockerClient.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/linux/runtime/docker/DockerClient.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/runtime/docker/DockerClient.java
index 77c53a8..18b5816 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/runtime/docker/DockerClient.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/runtime/docker/DockerClient.java
@@ -81,13 +81,13 @@ public final class DockerClient {
"'=' found in entry for docker command file, key = " + entry
.getKey() + "; value = " + entry.getValue());
}
- if (entry.getValue().contains("\n")) {
+ String value = StringUtils.join(",", entry.getValue());
+ if (value.contains("\n")) {
throw new ContainerExecutionException(
"'\\n' found in entry for docker command file, key = " + entry
- .getKey() + "; value = " + entry.getValue());
+ .getKey() + "; value = " + value);
}
- printWriter.println(" " + entry.getKey() + "=" + StringUtils
- .join(",", entry.getValue()));
+ printWriter.println(" " + entry.getKey() + "=" + value);
}
printWriter.close();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
