From be3b28f87bff1e2844a8848639400b1084571240 Mon Sep 17 00:00:00 2001
From: Ayush Saxena <ayushsaxena@apache.org>
Date: Fri, 23 Jun 2023 18:55:52 +0530
Subject: [PATCH] TEZ-4432: Remove useless maybeAddDefaultLoggingJavaOpts from
 TezClientUtils.

Change-Id: Ifc07ec38c8e1443f3958fb7376cd1652e3cca582
---
 .../java/org/apache/tez/client/TezClientUtils.java   | 12 ++++--------
 1 file changed, 4 insertions(+), 8 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 cda38ea94f..0ed0b69821 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
@@ -324,7 +324,7 @@ static void processTezLocalCredentialsFile(Credentials credentials, Configuratio
   /**
    * Verify or create the Staging area directory on the configured Filesystem
    * @param stagingArea Staging area directory path
-   * @return the FileSytem for the staging area directory
+   * @return the FileSystem for the staging area directory
    * @throws IOException
    */
   public static FileSystem ensureStagingDirExists(Configuration conf,
@@ -506,7 +506,7 @@ public static ApplicationSubmissionContext createApplicationSubmissionContext(
     String[] amLogParams = parseLogParams(amLogLevelString);
 
     String amLogLevel = amLogParams[0];
-    maybeAddDefaultLoggingJavaOpts(amLogLevel, vargs);
+    TezClientUtils.addLog4jSystemProperties(amLogLevel, vargs);
 
 
     // FIX sun bug mentioned in TEZ-327
@@ -761,11 +761,6 @@ static DAGPlan prepareAndCreateDAGPlan(DAG dag, AMConfiguration amConfig,
         amConfig.getBinaryConfLR(), tezLrsAsArchive, servicePluginsDescriptor, javaOptsChecker);
   }
 
-  static void maybeAddDefaultLoggingJavaOpts(String logLevel, List<String> vargs) {
-    Objects.requireNonNull(vargs);
-    TezClientUtils.addLog4jSystemProperties(logLevel, vargs);
-  }
-
   @Private
   public static String maybeAddDefaultLoggingJavaOpts(String logLevel, String javaOpts) {
     List<String> vargs = new ArrayList<String>(5);
@@ -774,7 +769,7 @@ public static String maybeAddDefaultLoggingJavaOpts(String logLevel, String java
     } else {
       vargs.add("");
     }
-    maybeAddDefaultLoggingJavaOpts(logLevel, vargs);
+    TezClientUtils.addLog4jSystemProperties(logLevel, vargs);
     if (vargs.size() == 1) {
       return vargs.get(0);
     }
@@ -820,6 +815,7 @@ public static String addDefaultsToTaskLaunchCmdOpts(String vOpts, Configuration
   @VisibleForTesting
   public static void addLog4jSystemProperties(String logLevel,
       List<String> vargs) {
+    Objects.requireNonNull(vargs);
     vargs.add("-Dlog4j.configuratorClass=org.apache.tez.common.TezLog4jConfigurator");
     vargs.add("-Dlog4j.configuration="
         + TezConstants.TEZ_CONTAINER_LOG4J_PROPERTIES_FILE);