From c6c4a2821e7e7ace26044da2d3982afcf1e0ba11 Mon Sep 17 00:00:00 2001 From: xlinliu Date: Wed, 18 Sep 2024 10:42:47 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A1=AC=E7=BC=96=E7=A0=81=20nebula=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../node/execution/service/impl/BuildJobActionImpl.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/src/main/java/com/webank/wedatasphere/dss/linkis/node/execution/service/impl/BuildJobActionImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/src/main/java/com/webank/wedatasphere/dss/linkis/node/execution/service/impl/BuildJobActionImpl.java index a74ffeefeb..dbb4c07fc7 100644 --- a/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/src/main/java/com/webank/wedatasphere/dss/linkis/node/execution/service/impl/BuildJobActionImpl.java +++ b/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/src/main/java/com/webank/wedatasphere/dss/linkis/node/execution/service/impl/BuildJobActionImpl.java @@ -24,6 +24,7 @@ import com.webank.wedatasphere.dss.linkis.node.execution.service.BuildJobAction; import org.apache.commons.lang3.SerializationUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.linkis.common.conf.CommonVars; import org.apache.linkis.manager.label.constant.LabelKeyConstant; import org.apache.linkis.manager.label.entity.engine.EngineTypeLabel; import org.apache.linkis.manager.label.utils.EngineTypeLabelCreator; @@ -47,6 +48,9 @@ public class BuildJobActionImpl implements BuildJobAction { private Logger logger = LoggerFactory.getLogger(BuildJobActionImpl.class); private static BuildJobAction buildJobAction = new BuildJobActionImpl(); + private static final String NEBULA = "nebula"; + private static final CommonVars NEBULA_ENGINE_VERSION = + CommonVars.apply("wds.linkis.nebula.engine.version", "3.0.0"); private BuildJobActionImpl() { @@ -133,6 +137,10 @@ public JobSubmitAction getSubmitAction(Job job) throws LinkisJobExecutionErrorEx String code = parseExecutionCodeFor1X(job); EngineTypeLabel engineTypeLabel = EngineTypeLabelCreator.createEngineTypeLabel(parseAppConnEngineType(job.getEngineType(), job)); + //TODO 升级linkis1.7.0版本之后，这段特殊的硬编码逻辑要去掉 + if(NEBULA.equalsIgnoreCase( engineTypeLabel.getEngineType())){ + engineTypeLabel.setVersion(NEBULA_ENGINE_VERSION.getValue()); + } labels.put(LabelKeyConstant.ENGINE_TYPE_KEY, engineTypeLabel.getStringValue()); labels.put(LabelKeyConstant.USER_CREATOR_TYPE_KEY, job.getUser() + "-" + LINKIS_JOB_CREATOR_1_X.getValue(job.getJobProps()));