YARN-7818. Remove privileged operation warnings during container launch for the ContainerRuntimes. Contributed by Shane Kumpf
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/502914ca Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/502914ca Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/502914ca Branch: refs/heads/HDDS-4 Commit: 502914ca32ac02b19116fd681eb8301b92fccbb3 Parents: a3b416f Author: Billie Rinaldi <bil...@apache.org> Authored: Fri May 4 08:53:55 2018 -0700 Committer: Billie Rinaldi <bil...@apache.org> Committed: Fri May 4 08:53:55 2018 -0700 ---------------------------------------------------------------------- .../linux/runtime/DefaultLinuxContainerRuntime.java | 5 +++-- .../linux/runtime/DockerLinuxContainerRuntime.java | 14 +++++++------- 2 files changed, 10 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/502914ca/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/runtime/DefaultLinuxContainerRuntime.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/DefaultLinuxContainerRuntime.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/DefaultLinuxContainerRuntime.java index d8db6ad..b5c933a 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/DefaultLinuxContainerRuntime.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/DefaultLinuxContainerRuntime.java @@ -108,6 +108,9 @@ public class DefaultLinuxContainerRuntime implements LinuxContainerRuntime { launchOp.appendArgs(tcCommandFile); } + // Some failures here are acceptable. Let the calling executor decide. + launchOp.disableFailureLogging(); + //List<String> -> stored as List -> fetched/converted to List<String> //we can't do better here thanks to type-erasure @SuppressWarnings("unchecked") @@ -118,8 +121,6 @@ public class DefaultLinuxContainerRuntime implements LinuxContainerRuntime { privilegedOperationExecutor.executePrivilegedOperation(prefixCommands, launchOp, null, null, false, false); } catch (PrivilegedOperationException e) { - LOG.warn("Launch container failed. Exception: ", e); - throw new ContainerExecutionException("Launch container failed", e .getExitCode(), e.getOutput(), e.getErrorOutput()); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/502914ca/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 ec1d055..0bacd03 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 @@ -914,13 +914,13 @@ public class DockerLinuxContainerRuntime implements LinuxContainerRuntime { PrivilegedOperation launchOp = buildLaunchOp(ctx, commandFile, runCommand); + // Some failures here are acceptable. Let the calling executor decide. + launchOp.disableFailureLogging(); + try { privilegedOperationExecutor.executePrivilegedOperation(null, launchOp, null, null, false, false); } catch (PrivilegedOperationException e) { - LOG.warn("Launch container failed. Exception: ", e); - LOG.info("Docker command used: " + runCommand); - throw new ContainerExecutionException("Launch container failed", e .getExitCode(), e.getOutput(), e.getErrorOutput()); } @@ -943,14 +943,14 @@ public class DockerLinuxContainerRuntime implements LinuxContainerRuntime { PrivilegedOperation launchOp = buildLaunchOp(ctx, commandFile, startCommand); + // Some failures here are acceptable. Let the calling executor decide. + launchOp.disableFailureLogging(); + try { privilegedOperationExecutor.executePrivilegedOperation(null, launchOp, null, null, false, false); } catch (PrivilegedOperationException e) { - LOG.warn("Relaunch container failed. Exception: ", e); - LOG.info("Docker command used: " + startCommand); - - throw new ContainerExecutionException("Launch container failed", e + throw new ContainerExecutionException("Relaunch container failed", e .getExitCode(), e.getOutput(), e.getErrorOutput()); } } else { --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
