You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@flink.apache.org by GitBox <gi...@apache.org> on 2019/11/07 15:42:44 UTC
[GitHub] [flink] kl0u commented on a change in pull request #10115:
[FLINK-14630] Re-enable logging for Yarn tests
kl0u commented on a change in pull request #10115: [FLINK-14630] Re-enable logging for Yarn tests
URL: https://github.com/apache/flink/pull/10115#discussion_r343720972
##########
File path: flink-yarn/src/main/java/org/apache/flink/yarn/cli/FlinkYarnSessionCli.java
##########
@@ -442,12 +443,21 @@ private void applyDescriptorOptionToConfig(final CommandLine commandLine, final
configuration.setString(YarnConfigOptions.NODE_LABEL, nodeLabelValue);
}
- discoverLogConfigFile().ifPresent(
- file -> configuration.setString(YarnConfigOptions.APPLICATION_LOG_CONFIG_FILE, file.getPath())
- );
+ setLogConfigFileInConfig(configuration, configurationDirectory);
}
- private Optional<File> discoverLogConfigFile() {
+ @VisibleForTesting
+ public static Configuration setLogConfigFileInConfig(final Configuration configuration, final String configurationDirectory) {
+ if (configuration.getString(YarnConfigOptionsInternal.APPLICATION_LOG_CONFIG_FILE) != null) {
+ return configuration;
+ }
+
+ FlinkYarnSessionCli.discoverLogConfigFile(configurationDirectory).ifPresent(file ->
+ configuration.setString(YarnConfigOptionsInternal.APPLICATION_LOG_CONFIG_FILE, file.getPath()));
+ return configuration;
+ }
+
+ private static Optional<File> discoverLogConfigFile(final String configurationDirectory) {
Review comment:
I pushed a commit for the changes. Can you check if this is what you mean?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services