Skip to content

Commit c03bf46

Browse files
committed
Resume feature about adapting to create workflow when have not scheduler.
1 parent f9fb692 commit c03bf46

File tree

3 files changed

+12
-7
lines changed

3 files changed

+12
-7
lines changed

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ private <K extends StructureRequestRef, V extends ResponseRef> V tryOrchestratio
185185
Long refProjectId, refOrchestrationId;
186186
if (askProjectSender) {
187187
ProjectRefIdResponse projectRefIdResponse = RpcAskUtils.processAskException(DSSSenderServiceFactory.getOrCreateServiceInstance().getProjectServerSender()
188-
.ask(new ProjectRefIdRequest(orchestrationPair.getValue().getId(), dssOrchestrator.getProjectId())), ProjectRefIdResponse.class, ProjectRefIdRequest.class);
188+
.ask(new ProjectRefIdRequest(Optional.ofNullable(orchestrationPair).map(ImmutablePair::getValue).map(AppInstance::getId).orElse(null), dssOrchestrator.getProjectId())), ProjectRefIdResponse.class, ProjectRefIdRequest.class);
189189
refProjectId = projectRefIdResponse.getRefProjectId();
190190
refOrchestrationId = null;
191191
} else {
@@ -378,11 +378,12 @@ protected ImmutablePair<OrchestrationService, AppInstance> getOrchestrationServi
378378
dssOrchestratorInfo.setLinkedAppConnNames(dssOrchestrator.getLinkedAppConn().stream().map(appConn -> appConn.getAppDesc().getAppName()).collect(Collectors.toList()));
379379
}
380380
SchedulerAppConn appConn = dssOrchestrator.getSchedulerAppConn();
381-
if (appConn == null) {
382-
throw new ExternalOperationWarnException(50322, "DSSOrchestrator " + dssOrchestrator.getName() + " has no SchedulerAppConn.");
381+
if (appConn != null) {
382+
AppInstance appInstance = appConn.getAppDesc().getAppInstances().get(0);
383+
return new ImmutablePair<>(appConn.getOrCreateStructureStandard().getOrchestrationService(appInstance), appInstance);
384+
} else {
385+
return new ImmutablePair<>(null, null);
383386
}
384-
AppInstance appInstance = appConn.getAppDesc().getAppInstances().get(0);
385-
return new ImmutablePair<>(appConn.getOrCreateStructureStandard().getOrchestrationService(appInstance), appInstance);
386387
}
387388

388389
/**

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package com.webank.wedatasphere.dss.orchestrator.server.service.impl;
1818

1919
import com.google.common.collect.Lists;
20+
import com.webank.wedatasphere.dss.appconn.core.AppConn;
2021
import com.webank.wedatasphere.dss.common.constant.project.ProjectUserPrivEnum;
2122
import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
2223
import com.webank.wedatasphere.dss.common.label.DSSLabel;
@@ -58,6 +59,7 @@
5859
import com.webank.wedatasphere.dss.standard.app.development.service.RefQueryService;
5960
import com.webank.wedatasphere.dss.standard.app.development.standard.DevelopmentIntegrationStandard;
6061
import com.webank.wedatasphere.dss.standard.app.sso.Workspace;
62+
import com.webank.wedatasphere.dss.standard.common.desc.AppDesc;
6163
import com.webank.wedatasphere.dss.standard.common.desc.AppInstance;
6264
import com.webank.wedatasphere.dss.standard.common.entity.ref.ResponseRef;
6365
import com.webank.wedatasphere.dss.standard.common.exception.operation.ExternalOperationWarnException;
@@ -123,7 +125,9 @@ public OrchestratorVo createOrchestrator(String userName,
123125
Map<String, Object> dssJobContent = MapUtils.newCommonMapBuilder()
124126
.put(OrchestratorRefConstant.DSS_ORCHESTRATOR_INFO_KEY, dssOrchestratorInfo)
125127
.put(OrchestratorRefConstant.ORCHESTRATOR_VERSION_KEY, version)
126-
.put(OrchestratorRefConstant.ORCHESTRATION_SCHEDULER_APP_CONN, dssOrchestrator.getSchedulerAppConn().getAppDesc().getAppName()).build();
128+
.put(OrchestratorRefConstant.ORCHESTRATION_SCHEDULER_APP_CONN, Optional.ofNullable(dssOrchestrator)
129+
.map(DSSOrchestrator::getSchedulerAppConn).map(AppConn::getAppDesc).map(AppDesc::getAppName)
130+
.map(Object::toString).orElse("NULL")).build();
127131
DSSJobContentRequestRef requestRef = (DSSJobContentRequestRef) developmentRequestRef;
128132
requestRef.setDSSJobContent(dssJobContent);
129133
return ((RefCreationOperation) developmentOperation).createRef(requestRef);

dss-orchestrator/dss-orchestrator-loader/src/main/java/com/webank/wedatasphere/dss/orchestrator/loader/DefaultOrchestratorLoader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ protected DSSOrchestratorContext createOrchestratorContext() {
6666
if (appConnList.stream().anyMatch(t -> t instanceof SchedulerAppConn)) {
6767
List<SchedulerAppConn> schedulerAppConns = AppConnManager.getAppConnManager().listAppConns(SchedulerAppConn.class);
6868
SchedulerAppConn schedulerAppConn;
69-
if(StringUtils.isBlank(relation.getBindingSchedulerAppConnName())) {
69+
if (StringUtils.isBlank(relation.getBindingSchedulerAppConnName())) {
7070
schedulerAppConn = schedulerAppConns.get(0);
7171
} else {
7272
schedulerAppConn = schedulerAppConns.stream().filter(appConn1 -> appConn1.getAppDesc().getAppName().equals(relation.getBindingSchedulerAppConnName()))

0 commit comments

Comments
 (0)