YARN-8791. Trim docker inspect output for line feed for STOPSIGNAL parsing. Contributed by Chandni Singh
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/efdea85a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/efdea85a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/efdea85a Branch: refs/heads/YARN-7402 Commit: efdea85ad1cd4cc5a2a306898dbdb2c14b952d02 Parents: 1824d5d Author: Eric Yang <ey...@apache.org> Authored: Wed Sep 19 13:16:11 2018 -0400 Committer: Eric Yang <ey...@apache.org> Committed: Wed Sep 19 13:16:11 2018 -0400 ---------------------------------------------------------------------- .../linux/runtime/DockerLinuxContainerRuntime.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/efdea85a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/runtime/DockerLinuxContainerRuntime.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/DockerLinuxContainerRuntime.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/DockerLinuxContainerRuntime.java index 2b53f13..55dfdc3 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/DockerLinuxContainerRuntime.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/DockerLinuxContainerRuntime.java @@ -1282,7 +1282,7 @@ public class DockerLinuxContainerRuntime implements LinuxContainerRuntime { DockerInspectCommand.STATUS_TEMPLATE, DockerInspectCommand.STOPSIGNAL_TEMPLATE}, delimiter); try { - String output = executeDockerInspect(containerId, inspectCommand); + String output = executeDockerInspect(containerId, inspectCommand).trim(); if (!output.isEmpty()) { String[] statusAndSignal = StringUtils.split(output, delimiter); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org