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

[Optimize-4127][gateway] The user-defined flink conf path overrides the flink conf path parameter #4154

Merged
merged 1 commit into from
Jan 17, 2025
Merged

[Optimize-4127][gateway] The user-defined flink conf path overrides the flink conf path parameter #4154

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
4 changes: 2 additions & 2 deletions dinky-common/src/main/java/org/dinky/data/enums/Status.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,8 +444,8 @@ public enum Status {
/**
* gateway config
*/
GAETWAY_KUBERNETS_TEST_FAILED(180, "gateway.kubernetes.test.failed"),
GAETWAY_KUBERNETS_TEST_SUCCESS(181, "gateway.kubernetes.test.success"),
GATEWAY_KUBERNETES_TEST_FAILED(180, "gateway.kubernetes.test.failed"),
GATEWAY_KUBERNETES_TEST_SUCCESS(181, "gateway.kubernetes.test.success"),

/**
* process
Expand Down
17 changes: 3 additions & 14 deletions dinky-core/src/main/java/org/dinky/job/JobConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import org.dinky.gateway.enums.SavePointStrategy;
import org.dinky.gateway.model.FlinkClusterConfig;

import org.apache.commons.lang3.StringUtils;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.configuration.CoreOptions;
import org.apache.flink.configuration.RestOptions;
Expand All @@ -43,14 +42,12 @@
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;

/**
* JobConfig
*
* @since 2021/6/27 18:45
*/
@Slf4j
@Data
@Builder
@AllArgsConstructor
Expand Down Expand Up @@ -261,17 +258,9 @@ public void buildGatewayConfig(FlinkClusterConfig config) {
flinkConfig.getConfiguration().put(customConfig.getName(), customConfig.getValue());
}

Map<String, String> configuration = flinkConfig.getConfiguration();

// In Kubernetes mode, must set jobmanager.memory.process.size.
if (StringUtils.isBlank(configuration.get("jobmanager.memory.process.size"))) {
log.warn("In Kubernetes mode, please configure 'jobmanager.memory.process.size', default 2048m");
configuration.put("jobmanager.memory.process.size", "2048m");
}

// Load job configuration content afterwards
configuration.putAll(getConfigJson());
configuration.put(CoreOptions.DEFAULT_PARALLELISM.key(), String.valueOf(parallelism));
// Load job configuration content afterwords
flinkConfig.getConfiguration().putAll(getConfigJson());
flinkConfig.getConfiguration().put(CoreOptions.DEFAULT_PARALLELISM.key(), String.valueOf(parallelism));
flinkConfig.setJobName(getJobName());

gatewayConfig = GatewayConfig.build(config);
Expand Down
10 changes: 8 additions & 2 deletions dinky-gateway/src/main/java/org/dinky/gateway/kubernetes/KubernetesGateway.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,11 @@
import org.dinky.gateway.result.TestResult;
import org.dinky.utils.TextUtil;

import org.apache.commons.lang3.StringUtils;
import org.apache.flink.configuration.ConfigOption;
import org.apache.flink.configuration.CoreOptions;
import org.apache.flink.configuration.DeploymentOptions;
import org.apache.flink.configuration.DeploymentOptionsInternal;
import org.apache.flink.configuration.GlobalConfiguration;
import org.apache.flink.configuration.PipelineOptions;
import org.apache.flink.kubernetes.KubernetesClusterClientFactory;
Expand Down Expand Up @@ -86,6 +88,10 @@ public void init() {

protected void initConfig() {
flinkConfigPath = config.getClusterConfig().getFlinkConfigPath();
// The user-defined flink conf path overrides the flink conf path parameter.
if (StringUtils.isNotBlank(flinkConfigPath)) {
addConfigParas(DeploymentOptionsInternal.CONF_DIR, flinkConfigPath);
}
flinkConfig = config.getFlinkConfig();
String jobName = flinkConfig.getJobName();
if (TextUtil.isEmpty(jobName)) {
Expand Down Expand Up @@ -222,9 +228,9 @@ public TestResult test() {
}
return TestResult.success();
} catch (Exception e) {
logger.error(Status.GAETWAY_KUBERNETS_TEST_FAILED.getMessage(), e);
logger.error(Status.GATEWAY_KUBERNETES_TEST_FAILED.getMessage(), e);
return TestResult.fail(
StrFormatter.format("{}:{}", Status.GAETWAY_KUBERNETS_TEST_FAILED.getMessage(), e.getMessage()));
StrFormatter.format("{}:{}", Status.GATEWAY_KUBERNETES_TEST_FAILED.getMessage(), e.getMessage()));
} finally {
close();
}
Expand Down
Loading