Skip to content

Commit 697d5eb

Browse files
committed
add comments
1 parent e42fef9 commit 697d5eb

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestLinuxContainerExecutorWithMocks.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,7 @@ public void testStartLocalizer() throws IOException {
314314
List<String> result=readMockParams();
315315

316316
if (Shell.isJavaVersionAtLeast(17)) {
317+
// Added by ContainerLocalizer for JDK17+ (MAPREDUCE-7456)
317318
assertTrue(result.remove("--add-exports=java.base/sun.net.dns=ALL-UNNAMED"));
318319
assertTrue(result.remove("--add-exports=java.base/sun.net.util=ALL-UNNAMED"));
319320
}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -715,6 +715,7 @@ public void testDefaultJavaOptionsWhenExtraJDK17OptionsAreConfigured() throws Ex
715715
List<String> javaOpts = localizer.getJavaOpts(conf);
716716

717717
if (Shell.isJavaVersionAtLeast(17)) {
718+
// Added by ContainerLocalizer for JDK17+ (MAPREDUCE-7456)
718719
assertTrue(javaOpts.contains("--add-exports=java.base/sun.net.dns=ALL-UNNAMED"));
719720
assertTrue(javaOpts.contains("--add-exports=java.base/sun.net.util=ALL-UNNAMED"));
720721
}
@@ -733,6 +734,7 @@ public void testDefaultJavaOptionsWhenExtraJDK17OptionsAreNotConfigured() throws
733734
List<String> javaOpts = localizer.getJavaOpts(conf);
734735

735736
if (Shell.isJavaVersionAtLeast(17)) {
737+
// Added by ContainerLocalizer for JDK17+ (MAPREDUCE-7456)
736738
assertFalse(javaOpts.contains("--add-exports=java.base/sun.net.dns=ALL-UNNAMED"));
737739
assertFalse(javaOpts.contains("--add-exports=java.base/sun.net.util=ALL-UNNAMED"));
738740
}
@@ -752,6 +754,7 @@ public void testAdminOptionsPrecedeUserDefinedJavaOptions() throws Exception {
752754
List<String> javaOpts = localizer.getJavaOpts(conf);
753755

754756
if (Shell.isJavaVersionAtLeast(17)) {
757+
// Added by ContainerLocalizer for JDK17+ (MAPREDUCE-7456)
755758
assertTrue(javaOpts.remove("--add-exports=java.base/sun.net.dns=ALL-UNNAMED"));
756759
assertTrue(javaOpts.remove("--add-exports=java.base/sun.net.util=ALL-UNNAMED"));
757760
}
@@ -773,6 +776,7 @@ public void testAdminOptionsPrecedeDefaultUserOptions() throws Exception {
773776
List<String> javaOpts = localizer.getJavaOpts(conf);
774777

775778
if (Shell.isJavaVersionAtLeast(17)) {
779+
// Added by ContainerLocalizer for JDK17+ (MAPREDUCE-7456)
776780
assertTrue(javaOpts.remove("--add-exports=java.base/sun.net.dns=ALL-UNNAMED"));
777781
assertTrue(javaOpts.remove("--add-exports=java.base/sun.net.util=ALL-UNNAMED"));
778782
}
@@ -793,6 +797,7 @@ public void testUserOptionsWhenAdminOptionsAreNotDefined() throws Exception {
793797
List<String> javaOpts = localizer.getJavaOpts(conf);
794798

795799
if (Shell.isJavaVersionAtLeast(17)) {
800+
// Added by ContainerLocalizer for JDK17+ (MAPREDUCE-7456)
796801
assertTrue(javaOpts.remove("--add-exports=java.base/sun.net.dns=ALL-UNNAMED"));
797802
assertTrue(javaOpts.remove("--add-exports=java.base/sun.net.util=ALL-UNNAMED"));
798803
}
@@ -810,6 +815,7 @@ public void testJavaOptionsWithoutDefinedAdminOrUserOptions() throws Exception {
810815
List<String> javaOpts = localizer.getJavaOpts(conf);
811816

812817
if (Shell.isJavaVersionAtLeast(17)) {
818+
// Added by ContainerLocalizer for JDK17+ (MAPREDUCE-7456)
813819
assertTrue(javaOpts.remove("--add-exports=java.base/sun.net.dns=ALL-UNNAMED"));
814820
assertTrue(javaOpts.remove("--add-exports=java.base/sun.net.util=ALL-UNNAMED"));
815821
}

0 commit comments

Comments
 (0)