Commit a855a376 authored by wenmo's avatar wenmo

修复perjob提交任务后报错

parent fa487535
package com.dlink.job; package com.dlink.job;
import com.dlink.executor.EnvironmentSetting;
import com.dlink.executor.Executor;
import com.dlink.executor.ExecutorSetting; import com.dlink.executor.ExecutorSetting;
import com.dlink.gateway.config.GatewayConfig; import com.dlink.gateway.config.GatewayConfig;
import com.dlink.session.SessionConfig; import com.dlink.session.SessionConfig;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import java.util.Map;
/** /**
* JobConfig * JobConfig
* *
...@@ -88,10 +84,6 @@ public class JobConfig { ...@@ -88,10 +84,6 @@ public class JobConfig {
return new ExecutorSetting(checkpoint,parallelism,useSqlFragment,savePointPath,jobName); return new ExecutorSetting(checkpoint,parallelism,useSqlFragment,savePointPath,jobName);
} }
public EnvironmentSetting getEnvironmentSetting(){
return EnvironmentSetting.build(address);
}
public void setSessionConfig(SessionConfig sessionConfig){ public void setSessionConfig(SessionConfig sessionConfig){
if(sessionConfig!=null) { if(sessionConfig!=null) {
address = sessionConfig.getAddress(); address = sessionConfig.getAddress();
......
...@@ -90,6 +90,7 @@ public class JobManager extends RunTime { ...@@ -90,6 +90,7 @@ public class JobManager extends RunTime {
config.getGatewayConfig().setTaskId(config.getTaskId()); config.getGatewayConfig().setTaskId(config.getTaskId());
config.getGatewayConfig().setFlinkConfig(FlinkConfig.build(config.getJobName(), config.getGatewayConfig().setFlinkConfig(FlinkConfig.build(config.getJobName(),
null,null,null,config.getSavePointPath(),null)); null,null,null,config.getSavePointPath(),null));
config.setUseRemote(false);
} }
} }
...@@ -343,6 +344,7 @@ public class JobManager extends RunTime { ...@@ -343,6 +344,7 @@ public class JobManager extends RunTime {
InsertResult insertResult = new InsertResult(gatewayResult.getAppId(), true); InsertResult insertResult = new InsertResult(gatewayResult.getAppId(), true);
job.setResult(insertResult); job.setResult(insertResult);
job.setJobId(gatewayResult.getAppId()); job.setJobId(gatewayResult.getAppId());
job.setJobManagerAddress(gatewayResult.getWebURL());
} }
job.setEndTime(LocalDateTime.now()); job.setEndTime(LocalDateTime.now());
job.setStatus(Job.JobStatus.SUCCESS); job.setStatus(Job.JobStatus.SUCCESS);
......
...@@ -9,4 +9,6 @@ package com.dlink.gateway.result; ...@@ -9,4 +9,6 @@ package com.dlink.gateway.result;
public interface GatewayResult { public interface GatewayResult {
String getAppId(); String getAppId();
String getWebURL();
} }
...@@ -33,6 +33,11 @@ public class SavePointResult extends AbstractGatewayResult { ...@@ -33,6 +33,11 @@ public class SavePointResult extends AbstractGatewayResult {
return appId; return appId;
} }
@Override
public String getWebURL() {
return null;
}
public static SavePointResult build(GatewayType type){ public static SavePointResult build(GatewayType type){
return new SavePointResult(type,LocalDateTime.now()); return new SavePointResult(type,LocalDateTime.now());
} }
......
...@@ -372,6 +372,9 @@ export default (): React.ReactNode => { ...@@ -372,6 +372,9 @@ export default (): React.ReactNode => {
<li> <li>
<Link>新增集群配置管理及维护页面</Link> <Link>新增集群配置管理及维护页面</Link>
</li> </li>
<li>
<Link>新增 Jar 管理及维护页面</Link>
</li>
</ul> </ul>
</Paragraph> </Paragraph>
</Timeline.Item> </Timeline.Item>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment