Skip to content

[AMORO-4211] Fix legacy Flink config loading #4249

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

Open
NikhilUjjwal7 wants to merge 1 commit into
base: master
Choose a base branch
from
+26 −3
Open

[AMORO-4211] Fix legacy Flink config loading #4249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions amoro-ams/src/main/java/org/apache/amoro/server/manager/FlinkOptimizerContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import org.apache.flink.api.common.JobID;
import org.apache.flink.client.program.rest.RestClusterClient;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.configuration.GlobalConfiguration;
import org.apache.flink.configuration.YamlParserUtils;
import org.apache.flink.core.execution.RestoreMode;
import org.apache.flink.runtime.messages.Acknowledge;
Expand All @@ -53,7 +54,6 @@
import org.apache.flink.runtime.webmonitor.handlers.JarUploadResponseBody;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.yaml.snakeyaml.Yaml;

import java.io.BufferedReader;
import java.io.File;
Expand Down Expand Up @@ -278,8 +278,8 @@ private Map<String, String> loadFlinkConfig() {
Map<String, Object> configDocument;
Path flinkConfPath = Paths.get(flinkConfDir + FLINK_CONFIG_YAML);
if (!Files.exists(flinkConfPath, LinkOption.NOFOLLOW_LINKS)) {
flinkConfPath = Paths.get(flinkConfDir + LEGACY_FLINK_CONFIG_YAML);
configDocument = new Yaml().load(Files.newInputStream(flinkConfPath));
configDocument = new HashMap<>();
configDocument.putAll(GlobalConfiguration.loadConfiguration(flinkConfDir).toMap());
} else {
configDocument = YamlParserUtils.loadYamlFile(new File(flinkConfPath.toUri()));
}
Expand Down
23 changes: 23 additions & 0 deletions amoro-ams/src/test/java/org/apache/amoro/server/manager/TestFlinkOptimizerContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,14 @@
import org.apache.amoro.shade.guava32.com.google.common.collect.Maps;
import org.apache.amoro.utils.MemorySize;
import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;

import java.io.File;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.HashMap;
import java.util.Map;
Expand All @@ -39,6 +44,8 @@
public class TestFlinkOptimizerContainer {
FlinkOptimizerContainer container = new FlinkOptimizerContainer();

@Rule public TemporaryFolder tempFolder = new TemporaryFolder();

Map<String, String> containerProperties = Maps.newHashMap();

public TestFlinkOptimizerContainer() {
Expand Down Expand Up @@ -99,6 +106,22 @@ public void testReadFlinkConfigFile() {
Assert.assertEquals(flinkConfig.get(JOB_MANAGER_TOTAL_PROCESS_MEMORY), "1600m");
}

@Test
public void testReadLegacyFlinkConfigWithMetricFilterIncludes() throws Exception {
File flinkConf = tempFolder.newFile("flink-conf.yaml");
Files.write(
flinkConf.toPath(),
String.join(
"\n",
"jobmanager.rpc.address: localhost",
"xxx.metrics.filter.includes: *RSS:*:*;Heap:Used,Max:*")
.getBytes(StandardCharsets.UTF_8));

Map<String, String> flinkConfig = container.loadFlinkConfigForYAML(flinkConf.toURI().toURL());
Assert.assertEquals("localhost", flinkConfig.get("jobmanager.rpc.address"));
Assert.assertEquals("*RSS:*:*;Heap:Used,Max:*", flinkConfig.get("xxx.metrics.filter.includes"));
}

@Test
public void testBuildFlinkOptions() {
Map<String, String> containerProperties = Maps.newHashMap(this.containerProperties);
Expand Down
Loading