Skip to content

Commit 1b4bb34

Browse files
author
gelxiogong
committed
change the type of flink separate
1 parent bbb74e6 commit 1b4bb34

File tree

2 files changed

+3
-2
lines changed
  • streamis-jobmanager
    • streamis-job-launcher/streamis-job-launcher-base/src/main/scala/com/webank/wedatasphere/streamis/jobmanager/launcher/job/conf
    • streamis-job-manager/streamis-job-manager-service/src/main/scala/com/webank/wedatasphere/streamis/jobmanager/manager/transform/impl

2 files changed

+3
-2
lines changed

streamis-jobmanager/streamis-job-launcher/streamis-job-launcher-base/src/main/scala/com/webank/wedatasphere/streamis/jobmanager/launcher/job/conf/JobConf.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,4 +159,6 @@ object JobConf {
159159
val PRODUCT_NAME_KEY: CommonVars[String] = CommonVars("wds.linkis.flink.product.key", "wds.linkis.flink.product")
160160

161161
val PRODUCT_NAME_SWITCH: CommonVars[Boolean] = CommonVars("wds.linkis.flink.product.key.enable", true)
162+
163+
val FLINK_APPLICATION_SEPARATE: CommonVars[String] = CommonVars("wds.linkis.flink.application.separate", "#")
162164
}

streamis-jobmanager/streamis-job-manager/streamis-job-manager-service/src/main/scala/com/webank/wedatasphere/streamis/jobmanager/manager/transform/impl/FlinkJarStreamisJobContentTransform.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ package com.webank.wedatasphere.streamis.jobmanager.manager.transform.impl
1818
import com.webank.wedatasphere.streamis.jobmanager.launcher.conf.{JobConfKeyConstants, JobConstants}
1919
import com.webank.wedatasphere.streamis.jobmanager.launcher.job.LaunchJob
2020
import com.webank.wedatasphere.streamis.jobmanager.launcher.job.conf.JobConf
21-
import com.webank.wedatasphere.streamis.jobmanager.manager.constrants.JobConstrants.FLINK_APPLICATION_SEPARATE
2221

2322
import java.util
2423
import org.apache.linkis.common.utils.JsonUtils
@@ -38,7 +37,7 @@ class FlinkJarStreamisJobContentTransform extends StreamisJobContentTransform {
3837
override protected def transformJobContent(transformJob: StreamisTransformJobContent): util.HashMap[String, AnyRef] = transformJob match {
3938
case transformJobContent: StreamisJarTransformJobContent =>
4039
val jobContent = new util.HashMap[String, AnyRef]
41-
jobContent.put("flink.app.args", transformJobContent.getArgs.asScala.mkString(FLINK_APPLICATION_SEPARATE))
40+
jobContent.put("flink.app.args", transformJobContent.getArgs.asScala.mkString(JobConf.FLINK_APPLICATION_SEPARATE.getHotValue()))
4241
jobContent.put("flink.app.main.class", transformJobContent.getMainClass)
4342
jobContent
4443
case _ => null

0 commit comments

Comments
 (0)