Skip to content

Commit 43a49df

Browse files
committed
flinkcof empty check
1 parent f18bdb6 commit 43a49df

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

launcher/src/main/java/com/dtstack/flink/sql/launcher/ClusterClientFactory.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,8 @@ public static ClusterClient createStandaloneClient(Options launcherOptions) thro
8383
}
8484

8585
public static ClusterClient createYarnSessionClient(Options launcherOptions) {
86-
87-
String flinkConfDir = launcherOptions.getFlinkconf();
88-
Configuration config = GlobalConfiguration.loadConfiguration(flinkConfDir);
86+
String flinkConfDir = StringUtils.isEmpty(launcherOptions.getFlinkconf()) ? "" : launcherOptions.getFlinkconf();
87+
Configuration config = StringUtils.isEmpty(flinkConfDir) ? new Configuration() : GlobalConfiguration.loadConfiguration(flinkConfDir);
8988
String yarnConfDir = launcherOptions.getYarnconf();
9089

9190
if (StringUtils.isNotBlank(yarnConfDir)) {

launcher/src/main/java/com/dtstack/flink/sql/launcher/LauncherMain.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public static void main(String[] args) throws Exception {
9292

9393
if(mode.equals(ClusterMode.yarnPer.name())){
9494
String flinkConfDir = launcherOptions.getFlinkconf();
95-
Configuration config = GlobalConfiguration.loadConfiguration(flinkConfDir);
95+
Configuration config = StringUtils.isEmpty(flinkConfDir) ? new Configuration() : GlobalConfiguration.loadConfiguration(flinkConfDir);
9696
JobGraph jobGraph = PackagedProgramUtils.createJobGraph(program, config, 1);
9797
PerJobSubmitter.submit(launcherOptions, jobGraph, config);
9898
} else {

launcher/src/main/java/com/dtstack/flink/sql/launcher/perjob/PerJobClusterClientBuilder.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@ public AbstractYarnClusterDescriptor createPerJobClusterDescriptor(Properties co
6969
throws MalformedURLException {
7070

7171
confProp.forEach((key, val) -> flinkConfig.setString(key.toString(), val.toString()));
72-
AbstractYarnClusterDescriptor clusterDescriptor = getClusterDescriptor(flinkConfig, yarnConf, launcherOptions.getFlinkconf());
72+
String flinkConf = StringUtils.isEmpty(launcherOptions.getFlinkconf()) ? "" : launcherOptions.getFlinkconf();
73+
AbstractYarnClusterDescriptor clusterDescriptor = getClusterDescriptor(flinkConfig, yarnConf, flinkConf);
7374

7475
if (StringUtils.isNotBlank(flinkJarPath)) {
7576
if (!new File(flinkJarPath).exists()) {

0 commit comments

Comments
 (0)