Repository: hadoop Updated Branches: refs/heads/branch-2 900e6b435 -> 073175629
YARN-7810. Update TestDockerContainerRuntime to test with current user credential. (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/07317562 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/07317562 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/07317562 Branch: refs/heads/branch-2 Commit: 0731756293e695e7bfefb1d05884a0893b3867c6 Parents: 900e6b4 Author: Eric Yang <ey...@apache.org> Authored: Mon Apr 16 13:39:21 2018 -0400 Committer: Eric Yang <ey...@apache.org> Committed: Mon Apr 16 13:39:21 2018 -0400 ---------------------------------------------------------------------- .../runtime/TestDockerContainerRuntime.java | 146 +++++++++++++------ 1 file changed, 102 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/07317562/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/runtime/TestDockerContainerRuntime.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/runtime/TestDockerContainerRuntime.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/runtime/TestDockerContainerRuntime.java index aef94a7..5920be3 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/runtime/TestDockerContainerRuntime.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/runtime/TestDockerContainerRuntime.java @@ -81,7 +81,9 @@ public class TestDockerContainerRuntime { private HashMap<String, String> env; private String image; private String uidGidPair; - private String runAsUser; + private String runAsUser = System.getProperty("user.name"); + private String[] groups = {}; + private String groupGids; private String user; private String appId; private String containerIdStr = containerId; @@ -130,8 +132,42 @@ public class TestDockerContainerRuntime { when(context.getEnvironment()).thenReturn(env); when(container.getUser()).thenReturn(submittingUser); - uidGidPair = ""; - runAsUser = "run_as_user"; + // Get the running user's uid and gid for remap + String uid = ""; + String gid = ""; + Shell.ShellCommandExecutor shexec1 = new Shell.ShellCommandExecutor( + new String[]{"id", "-u", runAsUser}); + Shell.ShellCommandExecutor shexec2 = new Shell.ShellCommandExecutor( + new String[]{"id", "-g", runAsUser}); + Shell.ShellCommandExecutor shexec3 = new Shell.ShellCommandExecutor( + new String[]{"id", "-G", runAsUser}); + try { + shexec1.execute(); + // get rid of newline at the end + uid = shexec1.getOutput().replaceAll("\n$", ""); + } catch (Exception e) { + LOG.info("Could not run id -u command: " + e); + } + try { + shexec2.execute(); + // get rid of newline at the end + gid = shexec2.getOutput().replaceAll("\n$", ""); + } catch (Exception e) { + LOG.info("Could not run id -g command: " + e); + } + try { + shexec3.execute(); + groups = shexec3.getOutput().replace("\n", " ").split(" "); + } catch (Exception e) { + LOG.info("Could not run id -G command: " + e); + } + uidGidPair = uid + ":" + gid; + StringBuilder sb = new StringBuilder(); + for (String group : groups) { + sb.append(group).append(","); + } + groupGids = sb.toString().replaceAll(",$", ""); + user = "user"; appId = "app_id"; containerIdStr = containerId; @@ -301,7 +337,7 @@ public class TestDockerContainerRuntime { List<String> dockerCommands = Files.readAllLines(Paths.get (dockerCommandFile), Charset.forName("UTF-8")); - int expected = 13; + int expected = 14; int counter = 0; Assert.assertEquals(expected, dockerCommands.size()); Assert.assertEquals("[docker-command-execution]", @@ -311,6 +347,8 @@ public class TestDockerContainerRuntime { Assert.assertEquals(" cap-drop=ALL", dockerCommands.get(counter++)); Assert.assertEquals(" detach=true", dockerCommands.get(counter++)); Assert.assertEquals(" docker-command=run", dockerCommands.get(counter++)); + Assert.assertEquals(" group-add=" + groupGids, + dockerCommands.get(counter++)); Assert.assertEquals(" hostname=ctr-id", dockerCommands.get(counter++)); Assert .assertEquals(" image=busybox:latest", dockerCommands.get(counter++)); @@ -326,7 +364,7 @@ public class TestDockerContainerRuntime { + "/test_container_log_dir:/test_container_log_dir," + "/test_user_local_dir:/test_user_local_dir", dockerCommands.get(counter++)); - Assert.assertEquals(" user=run_as_user", dockerCommands.get(counter++)); + Assert.assertEquals(" user=" + uidGidPair, dockerCommands.get(counter++)); Assert.assertEquals(" workdir=/test_container_work_dir", dockerCommands.get(counter++)); } @@ -505,7 +543,7 @@ public class TestDockerContainerRuntime { //This is the expected docker invocation for this case List<String> dockerCommands = Files .readAllLines(Paths.get(dockerCommandFile), Charset.forName("UTF-8")); - int expected = 13; + int expected = 14; int counter = 0; Assert.assertEquals(expected, dockerCommands.size()); Assert.assertEquals("[docker-command-execution]", @@ -515,6 +553,8 @@ public class TestDockerContainerRuntime { Assert.assertEquals(" cap-drop=ALL", dockerCommands.get(counter++)); Assert.assertEquals(" detach=true", dockerCommands.get(counter++)); Assert.assertEquals(" docker-command=run", dockerCommands.get(counter++)); + Assert.assertEquals(" group-add=" + groupGids, + dockerCommands.get(counter++)); Assert.assertEquals(" hostname=test.hostname", dockerCommands.get(counter++)); Assert @@ -532,7 +572,7 @@ public class TestDockerContainerRuntime { + "/test_container_log_dir:/test_container_log_dir," + "/test_user_local_dir:/test_user_local_dir", dockerCommands.get(counter++)); - Assert.assertEquals(" user=run_as_user", dockerCommands.get(counter++)); + Assert.assertEquals(" user=" + uidGidPair, dockerCommands.get(counter++)); Assert.assertEquals(" workdir=/test_container_work_dir", dockerCommands.get(counter++)); } @@ -571,7 +611,7 @@ public class TestDockerContainerRuntime { List<String> dockerCommands = Files .readAllLines(Paths.get(dockerCommandFile), Charset.forName("UTF-8")); - int expected = 13; + int expected = 14; int counter = 0; Assert.assertEquals(expected, dockerCommands.size()); Assert.assertEquals("[docker-command-execution]", @@ -581,6 +621,8 @@ public class TestDockerContainerRuntime { Assert.assertEquals(" cap-drop=ALL", dockerCommands.get(counter++)); Assert.assertEquals(" detach=true", dockerCommands.get(counter++)); Assert.assertEquals(" docker-command=run", dockerCommands.get(counter++)); + Assert.assertEquals(" group-add=" + groupGids, + dockerCommands.get(counter++)); Assert.assertEquals(" hostname=ctr-id", dockerCommands.get(counter++)); Assert .assertEquals(" image=busybox:latest", dockerCommands.get(counter++)); @@ -596,7 +638,7 @@ public class TestDockerContainerRuntime { + "/test_container_log_dir:/test_container_log_dir," + "/test_user_local_dir:/test_user_local_dir", dockerCommands.get(counter++)); - Assert.assertEquals(" user=run_as_user", dockerCommands.get(counter++)); + Assert.assertEquals(" user=" + uidGidPair, dockerCommands.get(counter++)); Assert.assertEquals(" workdir=/test_container_work_dir", dockerCommands.get(counter++)); @@ -624,6 +666,8 @@ public class TestDockerContainerRuntime { Assert.assertEquals(" cap-drop=ALL", dockerCommands.get(counter++)); Assert.assertEquals(" detach=true", dockerCommands.get(counter++)); Assert.assertEquals(" docker-command=run", dockerCommands.get(counter++)); + Assert.assertEquals(" group-add=" + groupGids, + dockerCommands.get(counter++)); Assert.assertEquals(" hostname=ctr-id", dockerCommands.get(counter++)); Assert .assertEquals(" image=busybox:latest", dockerCommands.get(counter++)); @@ -640,7 +684,7 @@ public class TestDockerContainerRuntime { + "/test_container_log_dir:/test_container_log_dir," + "/test_user_local_dir:/test_user_local_dir", dockerCommands.get(counter++)); - Assert.assertEquals(" user=run_as_user", dockerCommands.get(counter++)); + Assert.assertEquals(" user=" + uidGidPair, dockerCommands.get(counter++)); Assert.assertEquals(" workdir=/test_container_work_dir", dockerCommands.get(counter++)); @@ -677,7 +721,7 @@ public class TestDockerContainerRuntime { List<String> dockerCommands = Files.readAllLines(Paths.get (dockerCommandFile), Charset.forName("UTF-8")); - int expected = 13; + int expected = 14; Assert.assertEquals(expected, dockerCommands.size()); String command = dockerCommands.get(0); @@ -786,7 +830,7 @@ public class TestDockerContainerRuntime { List<String> dockerCommands = Files.readAllLines(Paths.get (dockerCommandFile), Charset.forName("UTF-8")); - int expected = 14; + int expected = 15; int counter = 0; Assert.assertEquals(expected, dockerCommands.size()); Assert.assertEquals("[docker-command-execution]", @@ -796,6 +840,8 @@ public class TestDockerContainerRuntime { Assert.assertEquals(" cap-drop=ALL", dockerCommands.get(counter++)); Assert.assertEquals(" detach=true", dockerCommands.get(counter++)); Assert.assertEquals(" docker-command=run", dockerCommands.get(counter++)); + Assert.assertEquals(" group-add=" + groupGids, + dockerCommands.get(counter++)); Assert.assertEquals(" hostname=ctr-id", dockerCommands.get(counter++)); Assert .assertEquals(" image=busybox:latest", dockerCommands.get(counter++)); @@ -812,7 +858,7 @@ public class TestDockerContainerRuntime { + "/test_container_log_dir:/test_container_log_dir," + "/test_user_local_dir:/test_user_local_dir", dockerCommands.get(counter++)); - Assert.assertEquals(" user=run_as_user", dockerCommands.get(counter++)); + Assert.assertEquals(" user=" + uidGidPair, dockerCommands.get(counter++)); Assert.assertEquals(" workdir=/test_container_work_dir", dockerCommands.get(counter++)); } @@ -903,33 +949,39 @@ public class TestDockerContainerRuntime { List<String> dockerCommands = Files.readAllLines(Paths.get (dockerCommandFile), Charset.forName("UTF-8")); - Assert.assertEquals(14, dockerCommands.size()); - Assert.assertEquals("[docker-command-execution]", dockerCommands.get(0)); + int expected = 15; + int counter = 0; + Assert.assertEquals(expected, dockerCommands.size()); + Assert.assertEquals("[docker-command-execution]", + dockerCommands.get(counter++)); Assert.assertEquals(" cap-add=SYS_CHROOT,NET_BIND_SERVICE", - dockerCommands.get(1)); - Assert.assertEquals(" cap-drop=ALL", dockerCommands.get(2)); - Assert.assertEquals(" detach=true", dockerCommands.get(3)); - Assert.assertEquals(" docker-command=run", dockerCommands.get(4)); - Assert.assertEquals(" hostname=ctr-id", dockerCommands.get(5)); - Assert.assertEquals(" image=busybox:latest", dockerCommands.get(6)); + dockerCommands.get(counter++)); + Assert.assertEquals(" cap-drop=ALL", dockerCommands.get(counter++)); + Assert.assertEquals(" detach=true", dockerCommands.get(counter++)); + Assert.assertEquals(" docker-command=run", dockerCommands.get(counter++)); + Assert.assertEquals(" group-add=" + groupGids, + dockerCommands.get(counter++)); + Assert.assertEquals(" hostname=ctr-id", dockerCommands.get(counter++)); + Assert.assertEquals(" image=busybox:latest", + dockerCommands.get(counter++)); Assert.assertEquals( " launch-command=bash,/test_container_work_dir/launch_container.sh", - dockerCommands.get(7)); - Assert.assertEquals(" name=container_id", dockerCommands.get(8)); - Assert.assertEquals(" net=host", dockerCommands.get(9)); + dockerCommands.get(counter++)); + Assert.assertEquals(" name=container_id", dockerCommands.get(counter++)); + Assert.assertEquals(" net=host", dockerCommands.get(counter++)); Assert.assertEquals( " ro-mounts=/test_local_dir/test_resource_file:test_mount", - dockerCommands.get(10)); + dockerCommands.get(counter++)); Assert.assertEquals( " rw-mounts=/test_container_local_dir:/test_container_local_dir," + "/test_filecache_dir:/test_filecache_dir," + "/test_container_work_dir:/test_container_work_dir," + "/test_container_log_dir:/test_container_log_dir," + "/test_user_local_dir:/test_user_local_dir", - dockerCommands.get(11)); - Assert.assertEquals(" user=run_as_user", dockerCommands.get(12)); + dockerCommands.get(counter++)); + Assert.assertEquals(" user=" + uidGidPair, dockerCommands.get(counter++)); Assert.assertEquals(" workdir=/test_container_work_dir", - dockerCommands.get(13)); + dockerCommands.get(counter)); } @Test @@ -973,34 +1025,40 @@ public class TestDockerContainerRuntime { List<String> dockerCommands = Files.readAllLines(Paths.get (dockerCommandFile), Charset.forName("UTF-8")); - Assert.assertEquals(14, dockerCommands.size()); - Assert.assertEquals("[docker-command-execution]", dockerCommands.get(0)); + int expected = 15; + int counter = 0; + Assert.assertEquals(expected, dockerCommands.size()); + Assert.assertEquals("[docker-command-execution]", + dockerCommands.get(counter++)); Assert.assertEquals(" cap-add=SYS_CHROOT,NET_BIND_SERVICE", - dockerCommands.get(1)); - Assert.assertEquals(" cap-drop=ALL", dockerCommands.get(2)); - Assert.assertEquals(" detach=true", dockerCommands.get(3)); - Assert.assertEquals(" docker-command=run", dockerCommands.get(4)); - Assert.assertEquals(" hostname=ctr-id", dockerCommands.get(5)); - Assert.assertEquals(" image=busybox:latest", dockerCommands.get(6)); + dockerCommands.get(counter++)); + Assert.assertEquals(" cap-drop=ALL", dockerCommands.get(counter++)); + Assert.assertEquals(" detach=true", dockerCommands.get(counter++)); + Assert.assertEquals(" docker-command=run", dockerCommands.get(counter++)); + Assert.assertEquals(" group-add=" + groupGids, + dockerCommands.get(counter++)); + Assert.assertEquals(" hostname=ctr-id", dockerCommands.get(counter++)); + Assert.assertEquals(" image=busybox:latest", + dockerCommands.get(counter++)); Assert.assertEquals( " launch-command=bash,/test_container_work_dir/launch_container.sh", - dockerCommands.get(7)); - Assert.assertEquals(" name=container_id", dockerCommands.get(8)); - Assert.assertEquals(" net=host", dockerCommands.get(9)); + dockerCommands.get(counter++)); + Assert.assertEquals(" name=container_id", dockerCommands.get(counter++)); + Assert.assertEquals(" net=host", dockerCommands.get(counter++)); Assert.assertEquals( " ro-mounts=/test_local_dir/test_resource_file:test_mount1," + "/test_local_dir/test_resource_file:test_mount2", - dockerCommands.get(10)); + dockerCommands.get(counter++)); Assert.assertEquals( " rw-mounts=/test_container_local_dir:/test_container_local_dir," + "/test_filecache_dir:/test_filecache_dir," + "/test_container_work_dir:/test_container_work_dir," + "/test_container_log_dir:/test_container_log_dir," + "/test_user_local_dir:/test_user_local_dir", - dockerCommands.get(11)); - Assert.assertEquals(" user=run_as_user", dockerCommands.get(12)); + dockerCommands.get(counter++)); + Assert.assertEquals(" user=" + uidGidPair, dockerCommands.get(counter++)); Assert.assertEquals(" workdir=/test_container_work_dir", - dockerCommands.get(13)); + dockerCommands.get(counter)); } @@ -1020,7 +1078,7 @@ public class TestDockerContainerRuntime { PrivilegedOperation op = capturePrivilegedOperation(); Assert.assertEquals(op.getOperationType(), PrivilegedOperation.OperationType.SIGNAL_CONTAINER); - Assert.assertEquals("run_as_user", op.getArguments().get(0)); + Assert.assertEquals(runAsUser, op.getArguments().get(0)); Assert.assertEquals("user", op.getArguments().get(1)); Assert.assertEquals("2", op.getArguments().get(2)); Assert.assertEquals("1234", op.getArguments().get(3)); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org