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 ey...@apache.org on 2018/12/17 17:30:56 UTC

hadoop git commit: YARN-9125. Fixed Carriage Return detection in Docker container launch. Contributed by Billie Rinaldi

Repository: hadoop
Updated Branches:
  refs/heads/branch-3.0 55da3078b -> 2ffd8487b


YARN-9125. Fixed Carriage Return detection in Docker container launch.
           Contributed by Billie Rinaldi


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2ffd8487
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2ffd8487
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2ffd8487

Branch: refs/heads/branch-3.0
Commit: 2ffd8487b47fc32e10fe35e20209f302fde5cd5e
Parents: 55da307
Author: Eric Yang <ey...@apache.org>
Authored: Mon Dec 17 12:29:49 2018 -0500
Committer: Eric Yang <ey...@apache.org>
Committed: Mon Dec 17 12:29:49 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/2ffd8487/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: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org