Skip to content

TEZ-4432: Remove useless maybeAddDefaultLoggingJavaOpts from TezClientUtils. #297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
abstractdog merged 1 commit into from
Jun 23, 2023
Merged

TEZ-4432: Remove useless maybeAddDefaultLoggingJavaOpts from TezClientUtils. #297

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions tez-api/src/main/java/org/apache/tez/client/TezClientUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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);
Expand All @@ -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);
}
Expand Down Expand Up @@ -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);
Expand Down