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

[Bug] load flink-conf bug fixed. #4109

Merged
merged 2 commits into from
Oct 7, 2024
Merged

[Bug] load flink-conf bug fixed. #4109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b9e809
[Improve] read flinkConf bug fixed.
wolfboys Oct 5, 2024
5a03657
[Improve] scala map bug fixed.
wolfboys Oct 5, 2024
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
16 changes: 13 additions & 3 deletions ...hims-base/src/main/scala/org/apache/streampark/flink/core/FlinkStreamingInitializer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,16 +86,26 @@ private[flink] class FlinkStreamingInitializer(args: Array[String], apiType: Api
throw new IllegalArgumentException(
"[StreamPark] Usage:can't fond config, please set \"--conf $path \" in main arguments")
}
val flinkConf = extractConfigByPrefix(configMap, KEY_FLINK_PROPERTY_PREFIX)
val appFlinkConf = extractConfigByPrefix(configMap, KEY_FLINK_PROPERTY_PREFIX)
val appConf = extractConfigByPrefix(configMap, KEY_APP_PREFIX)
// config priority: explicitly specified priority > project profiles > system profiles
val parameter = ParameterTool
.fromSystemProperties()
.mergeWith(ParameterTool.fromMap(flinkConf))
.mergeWith(ParameterTool.fromMap(appFlinkConf))
.mergeWith(ParameterTool.fromMap(appConf))
.mergeWith(argsMap)

val envConfig = Configuration.fromMap(flinkConf)
val flinkConf: Map[String, String] = {
parameter.get(KEY_FLINK_CONF(), null) match {
case flinkConf if flinkConf != null =>
PropertiesUtils
.loadFlinkConfYaml(DeflaterUtils.unzipString(flinkConf))
.filter(_._2.nonEmpty)
case _ => Map.empty
}
}

val envConfig = Configuration.fromMap(flinkConf ++ appFlinkConf)
FlinkConfiguration(parameter, envConfig, null)
}

Expand Down
18 changes: 14 additions & 4 deletions ...nk-shims-base/src/main/scala/org/apache/streampark/flink/core/FlinkTableInitializer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package org.apache.streampark.flink.core
import org.apache.streampark.common.conf.ConfigConst._
import org.apache.streampark.common.enums.{ApiType, PlannerType}
import org.apache.streampark.common.enums.ApiType.ApiType
import org.apache.streampark.common.util.DeflaterUtils
import org.apache.streampark.common.util.{DeflaterUtils, PropertiesUtils}
import org.apache.streampark.flink.core.EnhancerImplicit._

import org.apache.flink.api.java.utils.ParameterTool
Expand Down Expand Up @@ -182,17 +182,27 @@ private[flink] class FlinkTableInitializer(args: Array[String], apiType: ApiType
FlinkConfiguration(cliParameterTool, new Configuration(), new Configuration())
} else {
// config priority: explicitly specified priority > project profiles > system profiles
val flinkConf = extractConfigByPrefix(configMap, KEY_FLINK_PROPERTY_PREFIX)
val appFlinkConf = extractConfigByPrefix(configMap, KEY_FLINK_PROPERTY_PREFIX)
val appConf = extractConfigByPrefix(configMap, KEY_APP_PREFIX)
val tableConf = extractConfigByPrefix(configMap, KEY_FLINK_TABLE_PREFIX)
val sqlConf = extractConfigByPrefix(configMap, KEY_SQL_PREFIX)

val envConfig = Configuration.fromMap(flinkConf)
val flinkConf: Map[String, String] = {
parameter.get(KEY_FLINK_CONF(), null) match {
case flinkConf if flinkConf != null =>
PropertiesUtils
.loadFlinkConfYaml(DeflaterUtils.unzipString(flinkConf))
.filter(_._2.nonEmpty)
case _ => Map.empty
}
}

val envConfig = Configuration.fromMap(flinkConf ++ appFlinkConf)
val tableConfig = Configuration.fromMap(tableConf)

val parameterTool = ParameterTool
.fromSystemProperties()
.mergeWith(ParameterTool.fromMap(flinkConf))
.mergeWith(ParameterTool.fromMap(appFlinkConf))
.mergeWith(ParameterTool.fromMap(appConf))
.mergeWith(ParameterTool.fromMap(tableConf))
.mergeWith(ParameterTool.fromMap(sqlConf))
Expand Down
Loading