From 16edb4ac9629206fcd52a05326f5e625715287e4 Mon Sep 17 00:00:00 2001 From: Peter Szucs <116345192+p-szucs@users.noreply.github.com> Date: Thu, 14 Dec 2023 16:52:57 +0100 Subject: [PATCH] YARN-11630. Passing admin Java options to container localizers (#6349) --- .../hadoop/yarn/conf/YarnConfiguration.java | 7 +++ .../src/main/resources/yarn-default.xml | 9 +++ .../localizer/ContainerLocalizer.java | 17 ++++- .../localizer/TestContainerLocalizer.java | 62 +++++++++++++++++++ 4 files changed, 92 insertions(+), 3 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java index d195c8cdae..0ab4107c13 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java @@ -2232,6 +2232,13 @@ public static boolean isAclEnabled(Configuration conf) { public static final String NM_CONTAINER_LOCALIZER_JAVA_OPTS_DEFAULT = "-Xmx256m"; + /** The admin JVM options used on forking ContainerLocalizer process + by container executor. */ + public static final String NM_CONTAINER_LOCALIZER_ADMIN_JAVA_OPTS_KEY = + NM_PREFIX + "container-localizer.admin.java.opts"; + + public static final String NM_CONTAINER_LOCALIZER_ADMIN_JAVA_OPTS_DEFAULT = ""; + /* * Flag to indicate whether JDK17's required add-exports flags should be added to * container localizers regardless of the user specified JAVA_OPTS. diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml index b8892e4fc1..41e38f601c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml @@ -1488,6 +1488,15 @@ -Xmx256m + + + The admin JVM options used on forking ContainerLocalizer process + by the container executor. + + yarn.nodemanager.container-localizer.admin.java.opts + + + yarn.nodemanager.container-localizer.java.opts.add-exports-as-default true 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/localizer/ContainerLocalizer.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ContainerLocalizer.java index c928b19874..0477e7320f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ContainerLocalizer.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ContainerLocalizer.java @@ -47,6 +47,8 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; +import java.util.stream.Stream; import org.apache.hadoop.classification.InterfaceAudience.Private; import org.apache.hadoop.conf.Configuration; @@ -406,16 +408,25 @@ private LocalizerStatus createStatus() throws InterruptedException { * @param conf the configuration properties to launch the resource localizer. */ public static List getJavaOpts(Configuration conf) { - String opts = conf.get(YarnConfiguration.NM_CONTAINER_LOCALIZER_JAVA_OPTS_KEY, + String adminOpts = conf.get(YarnConfiguration.NM_CONTAINER_LOCALIZER_ADMIN_JAVA_OPTS_KEY, + YarnConfiguration.NM_CONTAINER_LOCALIZER_ADMIN_JAVA_OPTS_DEFAULT); + String userOpts = conf.get(YarnConfiguration.NM_CONTAINER_LOCALIZER_JAVA_OPTS_KEY, YarnConfiguration.NM_CONTAINER_LOCALIZER_JAVA_OPTS_DEFAULT); + boolean isExtraJDK17OptionsConfigured = conf.getBoolean(YarnConfiguration.NM_CONTAINER_LOCALIZER_JAVA_OPTS_ADD_EXPORTS_KEY, YarnConfiguration.NM_CONTAINER_LOCALIZER_JAVA_OPTS_ADD_EXPORTS_DEFAULT); if (Shell.isJavaVersionAtLeast(17) && isExtraJDK17OptionsConfigured) { - opts = opts.trim().concat(" " + ADDITIONAL_JDK17_PLUS_OPTIONS); + userOpts = userOpts.trim().concat(" " + ADDITIONAL_JDK17_PLUS_OPTIONS); } - return Arrays.asList(opts.split(" ")); + + List adminOptionList = Arrays.asList(adminOpts.split("\\s+")); + List userOptionList = Arrays.asList(userOpts.split("\\s+")); + + return Stream.concat(adminOptionList.stream(), userOptionList.stream()) + .filter(s -> !s.isEmpty()) + .collect(Collectors.toList()); } /** 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/localizer/TestContainerLocalizer.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestContainerLocalizer.java index 76aa73142e..8bde60e8db 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestContainerLocalizer.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestContainerLocalizer.java @@ -737,4 +737,66 @@ public void testDefaultJavaOptionsWhenExtraJDK17OptionsAreNotConfigured() throws } Assert.assertTrue(javaOpts.contains("-Xmx256m")); } + + @Test + public void testAdminOptionsPrecedeUserDefinedJavaOptions() throws Exception { + ContainerLocalizerWrapper wrapper = new ContainerLocalizerWrapper(); + ContainerLocalizer localizer = wrapper.setupContainerLocalizerForTest(); + + Configuration conf = new Configuration(); + conf.setStrings(YarnConfiguration.NM_CONTAINER_LOCALIZER_ADMIN_JAVA_OPTS_KEY, + "adminOption1 adminOption2"); + conf.setStrings(YarnConfiguration.NM_CONTAINER_LOCALIZER_JAVA_OPTS_KEY, + " userOption1 userOption2"); + List javaOpts = localizer.getJavaOpts(conf); + + Assert.assertEquals(4, javaOpts.size()); + Assert.assertTrue(javaOpts.get(0).equals("adminOption1")); + Assert.assertTrue(javaOpts.get(1).equals("adminOption2")); + Assert.assertTrue(javaOpts.get(2).equals("userOption1")); + Assert.assertTrue(javaOpts.get(3).equals("userOption2")); + } + + @Test + public void testAdminOptionsPrecedeDefaultUserOptions() throws Exception { + ContainerLocalizerWrapper wrapper = new ContainerLocalizerWrapper(); + ContainerLocalizer localizer = wrapper.setupContainerLocalizerForTest(); + + Configuration conf = new Configuration(); + conf.setStrings(YarnConfiguration.NM_CONTAINER_LOCALIZER_ADMIN_JAVA_OPTS_KEY, + "adminOption1 adminOption2"); + List javaOpts = localizer.getJavaOpts(conf); + + Assert.assertEquals(3, javaOpts.size()); + Assert.assertTrue(javaOpts.get(0).equals("adminOption1")); + Assert.assertTrue(javaOpts.get(1).equals("adminOption2")); + Assert.assertTrue(javaOpts.get(2).equals("-Xmx256m")); + } + + @Test + public void testUserOptionsWhenAdminOptionsAreNotDefined() throws Exception { + ContainerLocalizerWrapper wrapper = new ContainerLocalizerWrapper(); + ContainerLocalizer localizer = wrapper.setupContainerLocalizerForTest(); + + Configuration conf = new Configuration(); + conf.setStrings(YarnConfiguration.NM_CONTAINER_LOCALIZER_JAVA_OPTS_KEY, + "userOption1 userOption2"); + List javaOpts = localizer.getJavaOpts(conf); + + Assert.assertEquals(2, javaOpts.size()); + Assert.assertTrue(javaOpts.get(0).equals("userOption1")); + Assert.assertTrue(javaOpts.get(1).equals("userOption2")); + } + + @Test + public void testJavaOptionsWithoutDefinedAdminOrUserOptions() throws Exception { + ContainerLocalizerWrapper wrapper = new ContainerLocalizerWrapper(); + ContainerLocalizer localizer = wrapper.setupContainerLocalizerForTest(); + + Configuration conf = new Configuration(); + List javaOpts = localizer.getJavaOpts(conf); + + Assert.assertEquals(1, javaOpts.size()); + Assert.assertTrue(javaOpts.get(0).equals("-Xmx256m")); + } }