Skip to content

Commit 6ae88fd

Browse files
authored
[Optimization-4270] Check if the cluster is disabled before starting the flink session (#4330)
1 parent 86f78fe commit 6ae88fd

2 files changed

Lines changed: 4 additions & 6 deletions

File tree

dinky-admin/src/main/java/org/dinky/service/impl/ClusterConfigurationServiceImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ public List<ClusterConfiguration> listAllClusterConfig() {
7474
@Override
7575
public FlinkClusterConfig getAndCheckEnableFlinkClusterCfg(Integer id) {
7676
ClusterConfiguration cfg = this.getClusterConfigById(id);
77-
DinkyAssert.checkNull(cfg, "The clusterConfiguration not exists!");
78-
DinkyAssert.checkEnable(cfg, "The clusterConfiguration is Disable!");
77+
DinkyAssert.checkNull(cfg, "The cluster configuration does not exist.");
78+
DinkyAssert.checkEnable(cfg, "The cluster configuration has been disabled.");
7979
return FlinkClusterConfig.create(cfg.getType(), cfg.getConfigJson());
8080
}
8181

dinky-admin/src/main/java/org/dinky/service/impl/ClusterInstanceServiceImpl.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import org.dinky.data.model.ClusterInstance;
3333
import org.dinky.data.model.Task;
3434
import org.dinky.gateway.config.GatewayConfig;
35-
import org.dinky.gateway.exception.GatewayException;
3635
import org.dinky.gateway.model.FlinkClusterConfig;
3736
import org.dinky.gateway.result.GatewayResult;
3837
import org.dinky.job.JobConfig;
@@ -227,9 +226,8 @@ public void killCluster(Integer id) {
227226
@Override
228227
public ClusterInstance deploySessionCluster(Integer id) {
229228
ClusterConfiguration clusterCfg = clusterConfigurationService.getClusterConfigById(id);
230-
if (Asserts.isNull(clusterCfg)) {
231-
throw new GatewayException("The cluster configuration does not exist.");
232-
}
229+
DinkyAssert.checkNull(clusterCfg, "The cluster configuration does not exist.");
230+
DinkyAssert.checkEnable(clusterCfg, "The cluster configuration has been disabled.");
233231
GatewayConfig gatewayConfig =
234232
GatewayConfig.build(FlinkClusterConfig.create(clusterCfg.getType(), clusterCfg.getConfigJson()));
235233
gatewayConfig.setType(gatewayConfig.getType().getSessionType());

0 commit comments

Comments
 (0)