tillrohrmann 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_r343699397
##########
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:
Unrelated to this PR: Instead of a `String`, I would rather pass in a
`File`/`Path` if we require the configuration directory to be a file directory.
----------------------------------------------------------------
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:
[email protected]
With regards,
Apache Git Services
