Commit 6bd960ef authored by wenmo's avatar wenmo

同步前后台配置名

parent 2ad682bf
...@@ -13,19 +13,19 @@ import lombok.Setter; ...@@ -13,19 +13,19 @@ import lombok.Setter;
@Setter @Setter
public class ClusterConfig { public class ClusterConfig {
private String flinkConfigPath; private String flinkConfigPath;
private String flinkLibs; private String flinkLibPath;
private String yarnConfigPath; private String yarnConfigPath;
public ClusterConfig() { public ClusterConfig() {
} }
public ClusterConfig(String flinkConfigPath, String flinkLibs, String yarnConfigPath) { public ClusterConfig(String flinkConfigPath, String flinkLibPath, String yarnConfigPath) {
this.flinkConfigPath = flinkConfigPath; this.flinkConfigPath = flinkConfigPath;
this.flinkLibs = flinkLibs; this.flinkLibPath = flinkLibPath;
this.yarnConfigPath = yarnConfigPath; this.yarnConfigPath = yarnConfigPath;
} }
public static ClusterConfig build(String flinkConfigPath, String flinkLibs, String yarnConfigPath){ public static ClusterConfig build(String flinkConfigPath, String flinkLibPath, String yarnConfigPath){
return new ClusterConfig(flinkConfigPath,flinkLibs,yarnConfigPath); return new ClusterConfig(flinkConfigPath,flinkLibPath,yarnConfigPath);
} }
} }
...@@ -44,8 +44,8 @@ public class GatewayConfig { ...@@ -44,8 +44,8 @@ public class GatewayConfig {
if(para.has("flinkConfigPath")) { if(para.has("flinkConfigPath")) {
config.getClusterConfig().setFlinkConfigPath(para.get("flinkConfigPath").asText()); config.getClusterConfig().setFlinkConfigPath(para.get("flinkConfigPath").asText());
} }
if(para.has("flinkLibs")) { if(para.has("flinkLibPath")) {
config.getClusterConfig().setFlinkLibs(para.get("flinkLibs").asText()); config.getClusterConfig().setFlinkLibPath(para.get("flinkLibPath").asText());
} }
if(para.has("yarnConfigPath")) { if(para.has("yarnConfigPath")) {
config.getClusterConfig().setYarnConfigPath(para.get("yarnConfigPath").asText()); config.getClusterConfig().setYarnConfigPath(para.get("yarnConfigPath").asText());
......
...@@ -63,7 +63,7 @@ public abstract class YarnGateway extends AbstractGateway { ...@@ -63,7 +63,7 @@ public abstract class YarnGateway extends AbstractGateway {
if(Asserts.isNotNullString(config.getFlinkConfig().getSavePoint())) { if(Asserts.isNotNullString(config.getFlinkConfig().getSavePoint())) {
configuration.setString(SavepointConfigOptions.SAVEPOINT_PATH, config.getFlinkConfig().getSavePoint()); configuration.setString(SavepointConfigOptions.SAVEPOINT_PATH, config.getFlinkConfig().getSavePoint());
} }
configuration.set(YarnConfigOptions.PROVIDED_LIB_DIRS, Collections.singletonList(config.getClusterConfig().getFlinkLibs())); configuration.set(YarnConfigOptions.PROVIDED_LIB_DIRS, Collections.singletonList(config.getClusterConfig().getFlinkLibPath()));
configuration.set(YarnConfigOptions.APPLICATION_NAME, config.getFlinkConfig().getJobName()); configuration.set(YarnConfigOptions.APPLICATION_NAME, config.getFlinkConfig().getJobName());
YarnLogConfigUtil.setLogConfigFileInConfig(configuration, config.getClusterConfig().getFlinkConfigPath()); YarnLogConfigUtil.setLogConfigFileInConfig(configuration, config.getClusterConfig().getFlinkConfigPath());
} }
......
...@@ -363,6 +363,15 @@ export default (): React.ReactNode => { ...@@ -363,6 +363,15 @@ export default (): React.ReactNode => {
<li> <li>
<Link>更新 dlink 的 flink 主版本号为 1.13.3</Link> <Link>更新 dlink 的 flink 主版本号为 1.13.3</Link>
</li> </li>
<li>
<Link>新增 yarn-application 的作业提交方式</Link>
</li>
<li>
<Link>新增 yarn-perjob 的作业提交方式</Link>
</li>
<li>
<Link>新增集群配置管理及维护页面</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