Skip to content

[TEZ-3918] Setting tez.task.log.level does not work #135

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

Closed
jteagles wants to merge 1 commit into from
Closed

[TEZ-3918] Setting tez.task.log.level does not work #135

Show file tree
Hide file tree
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
22 changes: 13 additions & 9 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 @@ -760,13 +760,6 @@ static DAGPlan prepareAndCreateDAGPlan(DAG dag, AMConfiguration amConfig,

static void maybeAddDefaultLoggingJavaOpts(String logLevel, List<String> vargs) {
Objects.requireNonNull(vargs);
if (!vargs.isEmpty()) {
for (String arg : vargs) {
if (arg.contains(TezConstants.TEZ_ROOT_LOGGER_NAME)) {
return;
}
}
}
TezClientUtils.addLog4jSystemProperties(logLevel, vargs);
}

Expand Down Expand Up @@ -829,8 +822,19 @@ public static void addLog4jSystemProperties(String logLevel,
+ TezConstants.TEZ_CONTAINER_LOG4J_PROPERTIES_FILE);
vargs.add("-D" + YarnConfiguration.YARN_APP_CONTAINER_LOG_DIR + "="
+ ApplicationConstants.LOG_DIR_EXPANSION_VAR);
vargs.add("-D" + TezConstants.TEZ_ROOT_LOGGER_NAME + "=" + logLevel
+ "," + TezConstants.TEZ_CONTAINER_LOGGER_NAME);
boolean isRootLoggerPresent = false;
String rootLoggerArg = "-D" + TezConstants.TEZ_ROOT_LOGGER_NAME + "=" + logLevel
+ "," + TezConstants.TEZ_CONTAINER_LOGGER_NAME;
for (int i = 0; i < vargs.size(); i++) {
String arg = vargs.get(i);
if (arg.contains(TezConstants.TEZ_ROOT_LOGGER_NAME)) {
vargs.set(i, rootLoggerArg);
isRootLoggerPresent = true;
}
}
if (!isRootLoggerPresent) {
vargs.add(rootLoggerArg);
}
}

static ConfigurationProto createFinalConfProtoForApp(Configuration amConf,
Expand Down
10 changes: 10 additions & 0 deletions tez-api/src/test/java/org/apache/tez/client/TestTezClientUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -682,6 +682,16 @@ public void testDefaultLoggingJavaOpts() {
javaOpts.contains("-Dlog4j.configuratorClass=org.apache.tez.common.TezLog4jConfigurator"));
}

@Test
public void testDefaultLoggingJavaOptsWithRootLogger() {
String origJavaOpts = "-D" + TezConstants.TEZ_ROOT_LOGGER_NAME + "=INFO";
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"));
}

@Test (timeout = 5000)
public void testConfSerializationForAm() {
Configuration conf =new Configuration(false);
Expand Down