hadoop git commit: YARN-8656. container-executor should not write cgroup tasks files for docker containers. Contributed by Jim Brennan

2018-08-16 Thread jlowe 
Repository: hadoop
Updated Branches:
  refs/heads/branch-3.1 05547b1e0 -> 819a2a6f1


YARN-8656. container-executor should not write cgroup tasks files for docker 
containers. Contributed by Jim Brennan

(cherry picked from commit cb21eaa026d80a2c9836030d959c0dd7f87c4d6b)


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

Branch: refs/heads/branch-3.1
Commit: 819a2a6f10d1701b48a960f8436ea8dfded7e601
Parents: 05547b1
Author: Jason Lowe 
Authored: Thu Aug 16 10:06:17 2018 -0500
Committer: Jason Lowe 
Committed: Thu Aug 16 10:09:56 2018 -0500

--
 .../runtime/DockerLinuxContainerRuntime.java|  4 +--
 .../impl/container-executor.c   | 21 +---
 .../impl/container-executor.h   |  3 +--
 .../main/native/container-executor/impl/main.c  | 26 +++-
 .../runtime/TestDockerContainerRuntime.java |  8 +++---
 5 files changed, 10 insertions(+), 52 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/819a2a6f/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 4fe81e7..5c1b494 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
@@ -1160,7 +1160,6 @@ public class DockerLinuxContainerRuntime implements 
LinuxContainerRuntime {
 List localDirs = ctx.getExecutionAttribute(LOCAL_DIRS);
 @SuppressWarnings("unchecked")
 List logDirs = ctx.getExecutionAttribute(LOG_DIRS);
-String resourcesOpts = ctx.getExecutionAttribute(RESOURCES_OPTIONS);
 
 PrivilegedOperation launchOp = new PrivilegedOperation(
 PrivilegedOperation.OperationType.LAUNCH_DOCKER_CONTAINER);
@@ -1178,8 +1177,7 @@ public class DockerLinuxContainerRuntime implements 
LinuxContainerRuntime {
 localDirs),
 StringUtils.join(PrivilegedOperation.LINUX_FILE_PATH_SEPARATOR,
 logDirs),
-commandFile,
-resourcesOpts);
+commandFile);
 
 String tcCommandFile = ctx.getExecutionAttribute(TC_COMMAND_FILE);
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/819a2a6f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/container-executor.c
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/container-executor.c
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/container-executor.c
index 6734b94..f8b89ee 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/container-executor.c
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/container-executor.c
@@ -1547,9 +1547,7 @@ int launch_docker_container_as_user(const char * user, 
const char *app_id,
   const char *container_id, const char *work_dir,
   const char *script_name, const char *cred_file,
   const char *pid_file, char* const* local_dirs,
-  char* const* log_dirs, const char *command_file,
-  const char *resources_key,
-  char* const* resources_values) {
+  char* const* log_dirs, const char *command_file) 
{
   int exit_code = -1;
   char *script_file_dest = NULL;
   char *cred_file_dest = NULL;
@@ -1732,23 +1730,6 @@ int

hadoop git commit: YARN-8656. container-executor should not write cgroup tasks files for docker containers. Contributed by Jim Brennan

2018-08-16 Thread jlowe 
Repository: hadoop
Updated Branches:
  refs/heads/trunk 6df606f1b -> cb21eaa02


YARN-8656. container-executor should not write cgroup tasks files for docker 
containers. Contributed by Jim Brennan


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

Branch: refs/heads/trunk
Commit: cb21eaa026d80a2c9836030d959c0dd7f87c4d6b
Parents: 6df606f
Author: Jason Lowe 
Authored: Thu Aug 16 10:06:17 2018 -0500
Committer: Jason Lowe 
Committed: Thu Aug 16 10:06:17 2018 -0500

--
 .../runtime/DockerLinuxContainerRuntime.java|  4 +--
 .../impl/container-executor.c   | 21 +---
 .../impl/container-executor.h   |  3 +--
 .../main/native/container-executor/impl/main.c  | 26 +++-
 .../runtime/TestDockerContainerRuntime.java |  8 +++---
 5 files changed, 10 insertions(+), 52 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/cb21eaa0/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 5d6f61e..1872830 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
@@ -1156,7 +1156,6 @@ public class DockerLinuxContainerRuntime implements 
LinuxContainerRuntime {
 List localDirs = ctx.getExecutionAttribute(LOCAL_DIRS);
 @SuppressWarnings("unchecked")
 List logDirs = ctx.getExecutionAttribute(LOG_DIRS);
-String resourcesOpts = ctx.getExecutionAttribute(RESOURCES_OPTIONS);
 
 PrivilegedOperation launchOp = new PrivilegedOperation(
 PrivilegedOperation.OperationType.LAUNCH_DOCKER_CONTAINER);
@@ -1174,8 +1173,7 @@ public class DockerLinuxContainerRuntime implements 
LinuxContainerRuntime {
 localDirs),
 StringUtils.join(PrivilegedOperation.LINUX_FILE_PATH_SEPARATOR,
 logDirs),
-commandFile,
-resourcesOpts);
+commandFile);
 
 String tcCommandFile = ctx.getExecutionAttribute(TC_COMMAND_FILE);
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/cb21eaa0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/container-executor.c
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/container-executor.c
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/container-executor.c
index 6734b94..f8b89ee 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/container-executor.c
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/container-executor.c
@@ -1547,9 +1547,7 @@ int launch_docker_container_as_user(const char * user, 
const char *app_id,
   const char *container_id, const char *work_dir,
   const char *script_name, const char *cred_file,
   const char *pid_file, char* const* local_dirs,
-  char* const* log_dirs, const char *command_file,
-  const char *resources_key,
-  char* const* resources_values) {
+  char* const* log_dirs, const char *command_file) 
{
   int exit_code = -1;
   char *script_file_dest = NULL;
   char *cred_file_dest = NULL;
@@ -1732,23 +1730,6 @@ int launch_docker_container_as_user(const char * user, 
const char *app_id,
   }
 
   if (pid