Skip to content
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

Jump to bottom

[FLINK-33988][configuration] Fix the invalid configuration when using initialized root logger level on yarn deployment mode #24042

Merged
merged 2 commits into from
Jan 17, 2024
Merged

[FLINK-33988][configuration] Fix the invalid configuration when using initialized root logger level on yarn deployment mode #24042

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d39110d
[FLINK-33988][configuration] Fix the invalid configuration when using…
RocMarshal Jan 8, 2024
a746744
[FLINK-34102][configuration] Fix the invalid configuration when using…
RocMarshal Jan 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 20 additions & 0 deletions flink-yarn/src/main/java/org/apache/flink/yarn/YarnClusterDescriptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,8 @@
import static org.apache.flink.configuration.ConfigConstants.DEFAULT_FLINK_USR_LIB_DIR;
import static org.apache.flink.configuration.ConfigConstants.ENV_FLINK_LIB_DIR;
import static org.apache.flink.configuration.ConfigConstants.ENV_FLINK_OPT_DIR;
import static org.apache.flink.configuration.ResourceManagerOptions.CONTAINERIZED_MASTER_ENV_PREFIX;
import static org.apache.flink.configuration.ResourceManagerOptions.CONTAINERIZED_TASK_MANAGER_ENV_PREFIX;
import static org.apache.flink.runtime.entrypoint.component.FileJobGraphRetriever.JOB_GRAPH_FILE_PATH;
import static org.apache.flink.util.Preconditions.checkArgument;
import static org.apache.flink.util.Preconditions.checkNotNull;
Expand Down Expand Up @@ -204,6 +206,9 @@ public YarnClusterDescriptor(
this.flinkConfiguration = Preconditions.checkNotNull(flinkConfiguration);
this.userJarInclusion = getUserJarInclusionMode(flinkConfiguration);

adaptEnvSetting(flinkConfiguration, CoreOptions.FLINK_LOG_LEVEL, "ROOT_LOG_LEVEL");
adaptEnvSetting(flinkConfiguration, CoreOptions.FLINK_LOG_MAX, "MAX_LOG_FILE_NUMBER");

getLocalFlinkDistPath(flinkConfiguration).ifPresent(this::setLocalJarPath);
decodeFilesToShipToCluster(flinkConfiguration, YarnConfigOptions.SHIP_FILES)
.ifPresent(this::addShipFiles);
Expand All @@ -216,6 +221,21 @@ public YarnClusterDescriptor(
this.nodeLabel = flinkConfiguration.getString(YarnConfigOptions.NODE_LABEL);
}

/** Adapt flink env setting. */
private static <T> void adaptEnvSetting(
Configuration config, ConfigOption<T> configOption, String envKey) {
config.getOptional(configOption)
.ifPresent(
value -> {
config.setString(
CONTAINERIZED_MASTER_ENV_PREFIX + envKey,
String.valueOf(value));
config.setString(
CONTAINERIZED_TASK_MANAGER_ENV_PREFIX + envKey,
String.valueOf(value));
});
}

private Optional<List<Path>> decodeFilesToShipToCluster(
final Configuration configuration, final ConfigOption<List<String>> configOption) {
checkNotNull(configuration);
Expand Down