[tez] branch branch-0.9 updated: TEZ-4430: Fix tez.task.launch.cmd-opts property not working (#228) (Ganesha Shreedhara reviewed by Laszlo Bodor)

[abstractdog]

This is an automated email from the ASF dual-hosted git repository.

abstractdog pushed a commit to branch branch-0.9
in repository https://gitbox.apache.org/repos/asf/tez.git


The following commit(s) were added to refs/heads/branch-0.9 by this push:
     new 61ff5f7c7 TEZ-4430: Fix tez.task.launch.cmd-opts property not working 
(#228) (Ganesha Shreedhara reviewed by Laszlo Bodor)
61ff5f7c7 is described below

commit 61ff5f7c77574beb44a1b3ed0f3679e9e0eaa3b1
Author: Ganesha Shreedhara <ganeshashr...@gmail.com>
AuthorDate: Mon Jul 4 14:08:37 2022 +0530

    TEZ-4430: Fix tez.task.launch.cmd-opts property not working (#228) (Ganesha 
Shreedhara reviewed by Laszlo Bodor)
---
 tez-api/src/main/java/org/apache/tez/client/TezClientUtils.java     | 3 ++-
 tez-api/src/test/java/org/apache/tez/client/TestTezClientUtils.java | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tez-api/src/main/java/org/apache/tez/client/TezClientUtils.java 
b/tez-api/src/main/java/org/apache/tez/client/TezClientUtils.java
index 618a0245c..0e66eb168 100644
--- a/tez-api/src/main/java/org/apache/tez/client/TezClientUtils.java
+++ b/tez-api/src/main/java/org/apache/tez/client/TezClientUtils.java
@@ -29,6 +29,7 @@ import java.security.PrivilegedExceptionAction;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -757,7 +758,7 @@ public class TezClientUtils {
   public static String maybeAddDefaultLoggingJavaOpts(String logLevel, String 
javaOpts) {
     List<String> vargs = new ArrayList<String>(5);
     if (javaOpts != null) {
-      vargs.add(javaOpts);
+      Collections.addAll(vargs, javaOpts.split(" "));
     } else {
       vargs.add("");
     }
diff --git 
a/tez-api/src/test/java/org/apache/tez/client/TestTezClientUtils.java 
b/tez-api/src/test/java/org/apache/tez/client/TestTezClientUtils.java
index 36a2d5187..de2f19edf 100644
--- a/tez-api/src/test/java/org/apache/tez/client/TestTezClientUtils.java
+++ b/tez-api/src/test/java/org/apache/tez/client/TestTezClientUtils.java
@@ -682,12 +682,13 @@ public class TestTezClientUtils {
 
   @Test
   public void testDefaultLoggingJavaOptsWithRootLogger() {
-    String origJavaOpts = "-D" + TezConstants.TEZ_ROOT_LOGGER_NAME + "=INFO";
+    String origJavaOpts = "-D" + TezConstants.TEZ_ROOT_LOGGER_NAME + "=INFO 
-DtestProperty=value";
     String javaOpts = TezClientUtils.maybeAddDefaultLoggingJavaOpts("FOOBAR", 
origJavaOpts);
     Assert.assertNotNull(javaOpts);
     Assert.assertTrue(javaOpts.contains("-D" + 
TezConstants.TEZ_ROOT_LOGGER_NAME + "=FOOBAR"));
     
Assert.assertTrue(javaOpts.contains(TezConstants.TEZ_CONTAINER_LOG4J_PROPERTIES_FILE)
         && 
javaOpts.contains("-Dlog4j.configuratorClass=org.apache.tez.common.TezLog4jConfigurator"));
+    Assert.assertTrue(javaOpts.contains("-DtestProperty=value"));
   }
 
   @Test (timeout = 5000)