Skip to content

TEZ-4473: Remove pointless MDC_LOGGING message from logs if there is no custom MDC key. #294

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 2 commits into from
Jun 23, 2023
Merged

TEZ-4473: Remove pointless MDC_LOGGING message from logs if there is no custom MDC key. #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c423f14
TEZ-4473: Remove pointless MDC_LOGGING message from logs if there is …
ayushtkn Jun 21, 2023
139436b
trigger build
ayushtkn Jun 21, 2023
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
2 changes: 0 additions & 2 deletions tez-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,6 @@ public TezConfiguration(boolean loadDefaults) {
@ConfigurationScope(Scope.AM)
@ConfigurationProperty
public static final String TEZ_MDC_CUSTOM_KEYS = TEZ_PREFIX + "mdc.custom.keys";
public static final String TEZ_MDC_CUSTOM_KEYS_DEFAULT = "";

/**
* Comma separated list of Configuration keys. Tez will try to fill MDC with key value pairs in a
Expand All @@ -305,7 +304,6 @@ public TezConfiguration(boolean loadDefaults) {
@ConfigurationScope(Scope.AM)
@ConfigurationProperty
public static final String TEZ_MDC_CUSTOM_KEYS_CONF_PROPS = TEZ_MDC_CUSTOM_KEYS + ".conf.props";
public static final String TEZ_MDC_CUSTOM_KEYS_CONF_PROPS_DEFAULT = "";

/**
* double value. Represents ratio of unique failed outputs / number of consumer
Expand Down
6 changes: 2 additions & 4 deletions tez-common/src/main/java/org/apache/tez/util/LoggingUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,13 @@ public static void initLoggingContext(ThreadLocalMap threadLocalMap, Configurati
data.put("dagId", dagId == null ? "" : dagId);
data.put("taskAttemptId", taskAttemptId == null ? "" : taskAttemptId);

String[] mdcKeys = conf.getStrings(TezConfiguration.TEZ_MDC_CUSTOM_KEYS,
TezConfiguration.TEZ_MDC_CUSTOM_KEYS_DEFAULT);
String[] mdcKeys = conf.getStrings(TezConfiguration.TEZ_MDC_CUSTOM_KEYS);

if (mdcKeys == null || mdcKeys.length == 0) {
return;
}

String[] mdcKeysValuesFrom = conf.getStrings(TezConfiguration.TEZ_MDC_CUSTOM_KEYS_CONF_PROPS,
TezConfiguration.TEZ_MDC_CUSTOM_KEYS_CONF_PROPS_DEFAULT);
String[] mdcKeysValuesFrom = conf.getStrings(TezConfiguration.TEZ_MDC_CUSTOM_KEYS_CONF_PROPS);
LOG.info("MDC_LOGGING: setting up MDC keys: keys: {} / conf: {}", Arrays.asList(mdcKeys),
Arrays.asList(mdcKeysValuesFrom));

Expand Down