Skip to content

Commit

Permalink
addressing PR comments
Browse files Browse the repository at this point in the history
  • Loading branch information
abstractdog committed Feb 6, 2021
1 parent 7f57b6d commit 03ee238
Showing 1 changed file with 13 additions and 7 deletions.
20 changes: 13 additions & 7 deletions tez-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java
Original file line number Diff line number Diff line change
Expand Up @@ -254,15 +254,15 @@ public TezConfiguration(boolean loadDefaults) {
*/
@ConfigurationScope(Scope.AM)
@ConfigurationProperty
public static final String TEZ_LOG_PATTERN_LAYOUT_AM = TEZ_PREFIX + "log.pattern.layout.am";
public static final String TEZ_LOG_PATTERN_LAYOUT_AM = TEZ_AM_PREFIX + "log.pattern.layout";

/**
* By this option, user can easily override the logging pattern which is applied in
* TezContainerLogAppender in tasks, regardless of the environmental settings.
*/
@ConfigurationScope(Scope.AM)
@ConfigurationScope(Scope.VERTEX)
@ConfigurationProperty
public static final String TEZ_LOG_PATTERN_LAYOUT_TASK = TEZ_PREFIX + "log.pattern.layout.task";
public static final String TEZ_LOG_PATTERN_LAYOUT_TASK = TEZ_TASK_PREFIX + "log.pattern.layout";

/**
* Comma separated list of keys, which can used for defining keys in MDC. The corresponding values
Expand All @@ -274,10 +274,16 @@ public TezConfiguration(boolean loadDefaults) {
public static final String TEZ_MDC_CUSTOM_KEYS_DEFAULT = "";

/**
* Comma separated list of keys, which can used for defining keys in Configuration. Tez will try
* to fill MDC with key value pairs in a way that a key will be the nth item in
* tez.mdc.custom.keys and the value will be the value from a Configuration object pointed by the
* nth key of tez.mdc.custom.keys.values.from.
* Comma separated list of Configuration keys. Tez will try to fill MDC with key value pairs in a
* way that a key will be the nth item in tez.mdc.custom.keys and the value will be the value from
* a Configuration object pointed by the nth key of tez.mdc.custom.keys.values.from like below:
*
* tez.mdc.custom.keys=queryId,otherKey
* tez.mdc.custom.keys.values.from=awesome.sql.app.query.id,awesome.sql.app.other.key
*
* So MDC will contain key->value pairs as:
* queryId -> conf.get("awesome.sql.app.query.id")
* otherKey -> conf.get("awesome.sql.app.other.key")
*/
@ConfigurationScope(Scope.AM)
@ConfigurationProperty
Expand Down

0 comments on commit 03ee238

Please sign in to comment.