Skip to content

[ISSUE-4315][Bug] Fix multiline dynamic properties parsing #4359

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
hutiefang76 wants to merge 1 commit into
base: dev
Choose a base branch
from
+43 −2
Open

[ISSUE-4315][Bug] Fix multiline dynamic properties parsing #4359

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
23 changes: 21 additions & 2 deletions ...ark-common/src/main/scala/org/apache/streampark/common/util/FlinkConfigurationUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,9 @@ object FlinkConfigurationUtils extends Logger {
@Nonnull def extractDynamicProperties(properties: String): Map[String, String] = {
if (StringUtils.isEmpty(properties)) Map.empty[String, String]
else {
val normalizedProperties = normalizeDynamicProperties(properties)
val map = mutable.Map[String, String]()
val simple = properties.replaceAll(MULTI_PROPERTY_REGEXP, "")
val simple = normalizedProperties.replaceAll(MULTI_PROPERTY_REGEXP, "")
simple.split("\\s?-D") match {
case d if Utils.isNotEmpty(d) =>
d.foreach(x => {
Expand All @@ -113,7 +114,7 @@ object FlinkConfigurationUtils extends Logger {
})
case _ =>
}
val matcher = MULTI_PROPERTY_PATTERN.matcher(properties)
val matcher = MULTI_PROPERTY_PATTERN.matcher(normalizedProperties)
while (matcher.find()) {
val opts = matcher.group()
val index = opts.indexOf("=")
Expand All @@ -126,6 +127,24 @@ object FlinkConfigurationUtils extends Logger {
}
}

private[this] def normalizeDynamicProperties(properties: String): String = {
val normalized = new StringBuilder
properties.split("\\r?\\n").foreach { line =>
val trimmed = line.trim
if (trimmed.nonEmpty) {
if (trimmed.startsWith("-D")) {
if (normalized.nonEmpty) {
normalized.append(System.lineSeparator())
}
normalized.append(trimmed)
} else {
normalized.append(trimmed)
}
}
}
normalized.toString()
}

@Nonnull def extractArguments(args: String): List[String] = {
val programArgs = new ArrayBuffer[String]()
if (StringUtils.isNotEmpty(args)) {
Expand Down
22 changes: 22 additions & 0 deletions ...ark-common/src/test/scala/org/apache/streampark/common/util/PropertiesUtilsTestCase.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,26 @@ class PropertiesUtilsTestCase {
Assertions.assertEquals(map("diy.param.name"), "apache streampark")
}

@Test def testDynamicPropertiesWithMultilineValue(): Unit = {
val dynamicProperties =
"""
|-Dexecution.target=yarn-application
|-Dyarn.ship-files=/data/module/flink-1.20.2;
|/opt/module/flink-cdc-3.5.0/test1.pgsql-to-starrocks.yaml;
|/data/module/hadoop/hadoop-3.3.6/etc/hadoop/core-site.xml;
|/data/module/hadoop/hadoop-3.3.6/etc/hadoop/hdfs-site.xml
|-Dyarn.application.queue=flink
|""".stripMargin

val map = FlinkConfigurationUtils.extractDynamicProperties(dynamicProperties)
Assertions.assertEquals(map("execution.target"), "yarn-application")
Assertions.assertEquals(
map("yarn.ship-files"),
"/data/module/flink-1.20.2;" +
"/opt/module/flink-cdc-3.5.0/test1.pgsql-to-starrocks.yaml;" +
"/data/module/hadoop/hadoop-3.3.6/etc/hadoop/core-site.xml;" +
"/data/module/hadoop/hadoop-3.3.6/etc/hadoop/hdfs-site.xml")
Assertions.assertEquals(map("yarn.application.queue"), "flink")
}

}
Loading