From 500e02bf5abde586d567b29a6d4e8635b9f781ab Mon Sep 17 00:00:00 2001
From: wenmo <32723967+wenmo@users.noreply.github.com>
Date: Tue, 26 Dec 2023 00:14:04 +0800
Subject: [PATCH] [Fix-2778] [gateway] Fix starting the flink 1.15 session
 fails

---
 .../impl/ClusterInstanceServiceImpl.java      | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/dinky-admin/src/main/java/org/dinky/service/impl/ClusterInstanceServiceImpl.java b/dinky-admin/src/main/java/org/dinky/service/impl/ClusterInstanceServiceImpl.java
index 0409ef91f9..8b03a6abf2 100644
--- a/dinky-admin/src/main/java/org/dinky/service/impl/ClusterInstanceServiceImpl.java
+++ b/dinky-admin/src/main/java/org/dinky/service/impl/ClusterInstanceServiceImpl.java
@@ -24,6 +24,7 @@
 import org.dinky.cluster.FlinkCluster;
 import org.dinky.cluster.FlinkClusterInfo;
 import org.dinky.data.dto.ClusterInstanceDTO;
+import org.dinky.data.exception.DinkyException;
 import org.dinky.data.model.ClusterConfiguration;
 import org.dinky.data.model.ClusterInstance;
 import org.dinky.gateway.config.GatewayConfig;
@@ -203,13 +204,17 @@ public ClusterInstance deploySessionCluster(Integer id) {
                 GatewayConfig.build(FlinkClusterConfig.create(clusterCfg.getType(), clusterCfg.getConfigJson()));
         gatewayConfig.setType(gatewayConfig.getType().getSessionType());
         GatewayResult gatewayResult = JobManager.deploySessionCluster(gatewayConfig);
-        return registersCluster(ClusterInstanceDTO.autoRegistersClusterDTO(
-                gatewayResult.getWebURL().replace("http://", ""),
-                gatewayResult.getId(),
-                clusterCfg.getName() + "_" + LocalDateTime.now(),
-                clusterCfg.getName() + LocalDateTime.now(),
-                id,
-                null));
+        if (gatewayResult.isSuccess()) {
+            Asserts.checkNullString(gatewayResult.getWebURL(), "Unable to obtain Web URL.");
+            return registersCluster(ClusterInstanceDTO.autoRegistersClusterDTO(
+                    gatewayResult.getWebURL().replace("http://", ""),
+                    gatewayResult.getId(),
+                    clusterCfg.getName() + "_" + LocalDateTime.now(),
+                    clusterCfg.getName() + LocalDateTime.now(),
+                    id,
+                    null));
+        }
+        throw new DinkyException("Deploy session cluster error: " + gatewayResult.getError());
     }
 
     /**