Skip to content

Commit 33dc3f7

Browse files
qweqnotallowqweqnotallow
committed
Merge branch 'dev-1.3.1' into dev-1.4.0
# Conflicts: # assembly/dss-package/pom.xml # assembly/pom.xml # dss-appconn/appconns/dss-datachecker-appconn/pom.xml # dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml # dss-appconn/appconns/dss-eventchecker-appconn/pom.xml # dss-appconn/appconns/dss-schedulis-appconn/pom.xml # dss-appconn/appconns/dss-scriptis-appconn/pom.xml # dss-appconn/appconns/dss-sendemail-appconn/pom.xml # dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/pom.xml # dss-appconn/appconns/dss-sso-appconn/pom.xml # dss-appconn/appconns/dss-workflow-appconn/pom.xml # dss-appconn/dss-appconn-core/pom.xml # dss-appconn/dss-appconn-loader/pom.xml # dss-appconn/dss-appconn-manager/dss-appconn-manager-client/pom.xml # dss-appconn/dss-appconn-manager/dss-appconn-manager-core/pom.xml # dss-appconn/dss-appconn-manager/pom.xml # dss-appconn/dss-scheduler-appconn/pom.xml # dss-appconn/linkis-appconn-engineplugin/pom.xml # dss-appconn/pom.xml # dss-apps/dss-apiservice-server/pom.xml # dss-apps/dss-apps-server/pom.xml # dss-apps/dss-data-api/dss-api-sql-template/pom.xml # dss-apps/dss-data-api/dss-data-api-server/pom.xml # dss-apps/dss-data-api/pom.xml # dss-apps/dss-data-governance/dss-data-asset-server/pom.xml # dss-apps/dss-data-governance/dss-data-classification-server/pom.xml # dss-apps/dss-data-governance/dss-data-governance-common/pom.xml # dss-apps/dss-data-governance/dss-data-governance-server/pom.xml # dss-apps/dss-data-governance/pom.xml # dss-apps/dss-scriptis-server/pom.xml # dss-apps/dss-user-guide/dss-user-guide-server/pom.xml # dss-apps/dss-user-guide/pom.xml # dss-apps/pom.xml # dss-commons/dss-common/pom.xml # dss-commons/dss-contextservice/pom.xml # dss-commons/dss-sender-service/pom.xml # dss-commons/pom.xml # dss-framework/dss-appconn-framework/pom.xml # dss-framework/dss-framework-admin-service/pom.xml # dss-framework/dss-framework-common/pom.xml # dss-framework/dss-framework-orchestrator-server/pom.xml # dss-framework/dss-framework-project-server/pom.xml # dss-framework/dss-framework-proxy-user-service/pom.xml # dss-framework/dss-framework-workspace-server/pom.xml # dss-framework/framework-plugins/dss-framework-migrate-server/pom.xml # dss-framework/framework-plugins/dss-framework-orchestrator-publish/pom.xml # dss-framework/pom.xml # dss-orchestrator/dss-orchestrator-common/pom.xml # dss-orchestrator/dss-orchestrator-conversion-standard/pom.xml # dss-orchestrator/dss-orchestrator-core/pom.xml # dss-orchestrator/dss-orchestrator-db/pom.xml # dss-orchestrator/dss-orchestrator-loader/pom.xml # dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/pom.xml # dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/pom.xml # dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/pom.xml # dss-orchestrator/orchestrators/dss-workflow/dss-workflow-conversion-standard/pom.xml # dss-orchestrator/orchestrators/dss-workflow/dss-workflow-sdk/pom.xml # dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/pom.xml # dss-orchestrator/orchestrators/dss-workflow/pom.xml # dss-orchestrator/pom.xml # dss-server/pom.xml # dss-standard/development-standard/development-process-standard-execution/pom.xml # dss-standard/development-standard/development-process-standard/pom.xml # dss-standard/dss-standard-common/pom.xml # dss-standard/pom.xml # dss-standard/sso-standard/origin-sso-integration-standard/pom.xml # dss-standard/sso-standard/spring-origin-sso-integration-plugin/pom.xml # dss-standard/sso-standard/sso-integration-standard/pom.xml # dss-standard/structure-standard/dss-project-plugin/pom.xml # dss-standard/structure-standard/dss-role-plugin/pom.xml # dss-standard/structure-standard/dss-structure-integration-standard/pom.xml # dss-standard/structure-standard/spring-origin-dss-project-plugin/pom.xml # plugins/azkaban/linkis-jobtype/pom.xml # plugins/dolphinscheduler/dolphinscheduler-prod-metrics/pom.xml # plugins/dolphinscheduler/dss-dolphinscheduler-client/pom.xml # plugins/dolphinscheduler/dss-dolphinscheduler-token/pom.xml # plugins/dolphinscheduler/pom.xml # plugins/linkis/dss-gateway-support/pom.xml # pom.xml
2 parents 8d94bbd + 35f9310 commit 33dc3f7

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

‎dss-appconn/appconns/dss-workflow-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/workflow/opertion/WorkflowRefCopyOperation.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package com.webank.wedatasphere.dss.appconn.workflow.opertion;
1818

19+
import com.webank.wedatasphere.dss.common.label.DSSLabel;
1920
import com.webank.wedatasphere.dss.common.utils.RpcAskUtils;
2021
import com.webank.wedatasphere.dss.orchestrator.common.ref.OrchestratorRefConstant;
2122
import com.webank.wedatasphere.dss.sender.service.DSSSenderServiceFactory;
@@ -28,6 +29,7 @@
2829
import org.apache.linkis.rpc.Sender;
2930

3031
import java.util.HashMap;
32+
import java.util.List;
3133
import java.util.Map;
3234
import java.util.Optional;
3335

@@ -54,7 +56,9 @@ public RefJobContentResponseRef copyRef(ThirdlyRequestRef.CopyWitContextRequestR
5456
workflowCopyRequestRef.getWorkspace(), appId, contextIdStr,
5557
projectName, version, description, workflowCopyRequestRef.getDSSLabels(),
5658
targetProjectId, (String) nodeSuffix.orElse(null), (String) newFlowName.orElse(null));
57-
ResponseCopyWorkflow responseCopyWorkflow = RpcAskUtils.processAskException(sender.ask(requestCopyWorkflow),
59+
List<DSSLabel> dssLabels = workflowCopyRequestRef.getDSSLabels();
60+
Sender tempSend = DSSSenderServiceFactory.getOrCreateServiceInstance().getWorkflowSender(dssLabels);
61+
ResponseCopyWorkflow responseCopyWorkflow = RpcAskUtils.processAskException(tempSend.ask(requestCopyWorkflow),
5862
ResponseCopyWorkflow.class, RequestCopyWorkflow.class);
5963
Map<String, Object> refJobContent = new HashMap<>(2);
6064
refJobContent.put(OrchestratorRefConstant.ORCHESTRATION_ID_KEY, responseCopyWorkflow.getDssFlow().getId());

‎dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,9 +327,15 @@ public String copyOrchestrator(String username, OrchestratorCopyRequest orchestr
327327
} else if (orchestratorCopyRequest.getWorkflowNodeSuffix().length() > 10) {
328328
DSSExceptionUtils.dealErrorException(6014, "The node suffix length can not exceed 10. (节点后缀长度不能超过10)", DSSOrchestratorErrorException.class);
329329
}
330+
String dssLabel = null;
331+
if (orchestratorCopyRequest.getLabels()!= null && orchestratorCopyRequest.getLabels().getRoute() != null) {
332+
dssLabel = orchestratorCopyRequest.getLabels().getRoute();
333+
} else {
334+
dssLabel = DSSCommonUtils.ENV_LABEL_VALUE_DEV;
335+
}
330336
OrchestratorCopyVo orchestratorCopyVo = new OrchestratorCopyVo.Builder(username, sourceProject.getId(), sourceProject.getName(), targetProject.getId(),
331337
targetProject.getName(), sourceOrchestratorInfo, orchestratorCopyRequest.getTargetOrchestratorName(),
332-
orchestratorCopyRequest.getWorkflowNodeSuffix(), new EnvDSSLabel(DSSCommonUtils.ENV_LABEL_VALUE_DEV),
338+
orchestratorCopyRequest.getWorkflowNodeSuffix(), new EnvDSSLabel(dssLabel),
333339
workspace, Sender.getThisInstance()).setCopyTaskId(null).build();
334340
OrchestratorCopyJob orchestratorCopyJob = new OrchestratorCopyJob();
335341
orchestratorCopyJob.setOrchestratorCopyVo(orchestratorCopyVo);

0 commit comments

Comments
 (0)