[Optimization-3215][admin] Optimize the configuration of dinky address

aiwenmo · Mar 1, 2024 · 5edcc68 · 5edcc68
1 parent 03a75c4
commit 5edcc68
Show file tree

Hide file tree

Showing 46 changed files with 339 additions and 320 deletions.
diff --git a/dinky-admin/src/main/java/org/dinky/data/dto/APIExplainSqlDTO.java b/dinky-admin/src/main/java/org/dinky/data/dto/APIExplainSqlDTO.java
@@ -19,7 +19,7 @@
 
 package org.dinky.data.dto;
 
-import org.dinky.gateway.enums.GatewayType;
+import org.dinky.data.enums.GatewayType;
 import org.dinky.job.JobConfig;
 
 import java.util.Map;

diff --git a/dinky-admin/src/main/java/org/dinky/data/dto/StudioMetaStoreDTO.java b/dinky-admin/src/main/java/org/dinky/data/dto/StudioMetaStoreDTO.java
@@ -19,7 +19,7 @@
 
 package org.dinky.data.dto;
 
-import org.dinky.gateway.enums.GatewayType;
+import org.dinky.data.enums.GatewayType;
 import org.dinky.job.JobConfig;
 
 import io.swagger.annotations.ApiModel;

diff --git a/dinky-admin/src/main/java/org/dinky/init/EnvInit.java b/dinky-admin/src/main/java/org/dinky/init/EnvInit.java
@@ -41,7 +41,7 @@ public void run(ApplicationArguments args) throws Exception {
         ApplicationContext application = SpringUtil.getApplicationContext();
         Environment env = application.getEnvironment();
         String port = env.getProperty("server.port");
-        System.setProperty("dinkyAddr", ipAddress + ":" + port);
+        System.setProperty("dinkyAddr", "http://" + ipAddress + ":" + port);
         log.info(
                 "\n----------------------------------------------------------\n\t"
                         + "Application 'Dinky' is running! Access URLs:\n\t"

diff --git a/dinky-admin/src/main/java/org/dinky/job/handler/Job2MysqlHandler.java b/dinky-admin/src/main/java/org/dinky/job/handler/Job2MysqlHandler.java
@@ -25,6 +25,7 @@
 import org.dinky.daemon.task.DaemonTask;
 import org.dinky.daemon.task.DaemonTaskConfig;
 import org.dinky.data.dto.ClusterInstanceDTO;
+import org.dinky.data.enums.GatewayType;
 import org.dinky.data.enums.JobStatus;
 import org.dinky.data.model.ClusterInstance;
 import org.dinky.data.model.Task;
@@ -33,7 +34,6 @@
 import org.dinky.data.model.job.JobInstance;
 import org.dinky.data.model.mapping.ClusterConfigurationMapping;
 import org.dinky.data.model.mapping.ClusterInstanceMapping;
-import org.dinky.gateway.enums.GatewayType;
 import org.dinky.job.FlinkJobTask;
 import org.dinky.job.Job;
 import org.dinky.service.ClusterConfigurationService;

diff --git a/dinky-admin/src/main/java/org/dinky/job/handler/JobRefreshHandler.java b/dinky-admin/src/main/java/org/dinky/job/handler/JobRefreshHandler.java
@@ -25,6 +25,7 @@
 import org.dinky.data.constant.FlinkRestResultConstant;
 import org.dinky.data.dto.ClusterConfigurationDTO;
 import org.dinky.data.dto.JobDataDto;
+import org.dinky.data.enums.GatewayType;
 import org.dinky.data.enums.JobStatus;
 import org.dinky.data.flink.backpressure.FlinkJobNodeBackPressure;
 import org.dinky.data.flink.checkpoint.CheckPointOverView;
@@ -37,7 +38,6 @@
 import org.dinky.data.model.job.JobInstance;
 import org.dinky.gateway.Gateway;
 import org.dinky.gateway.config.GatewayConfig;
-import org.dinky.gateway.enums.GatewayType;
 import org.dinky.gateway.exception.NotSupportGetStatusException;
 import org.dinky.gateway.model.FlinkClusterConfig;
 import org.dinky.job.JobConfig;

diff --git a/dinky-admin/src/main/java/org/dinky/service/impl/CatalogueServiceImpl.java b/dinky-admin/src/main/java/org/dinky/service/impl/CatalogueServiceImpl.java
@@ -24,6 +24,7 @@
 import org.dinky.assertion.Asserts;
 import org.dinky.config.Dialect;
 import org.dinky.data.dto.CatalogueTaskDTO;
+import org.dinky.data.enums.GatewayType;
 import org.dinky.data.enums.JobLifeCycle;
 import org.dinky.data.enums.JobStatus;
 import org.dinky.data.enums.Status;
@@ -36,7 +37,6 @@
 import org.dinky.data.model.job.JobHistory;
 import org.dinky.data.model.job.JobInstance;
 import org.dinky.data.result.Result;
-import org.dinky.gateway.enums.GatewayType;
 import org.dinky.mapper.CatalogueMapper;
 import org.dinky.mybatis.service.impl.SuperServiceImpl;
 import org.dinky.service.CatalogueService;

diff --git a/dinky-admin/src/main/java/org/dinky/service/impl/ClusterConfigurationServiceImpl.java b/dinky-admin/src/main/java/org/dinky/service/impl/ClusterConfigurationServiceImpl.java
@@ -21,12 +21,12 @@
 
 import org.dinky.assertion.DinkyAssert;
 import org.dinky.data.dto.ClusterConfigurationDTO;
+import org.dinky.data.enums.GatewayType;
 import org.dinky.data.enums.Status;
 import org.dinky.data.exception.BusException;
 import org.dinky.data.model.ClusterConfiguration;
 import org.dinky.data.model.Task;
 import org.dinky.gateway.config.GatewayConfig;
-import org.dinky.gateway.enums.GatewayType;
 import org.dinky.gateway.model.FlinkClusterConfig;
 import org.dinky.gateway.result.TestResult;
 import org.dinky.job.JobManager;

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
@@ -24,14 +24,14 @@
 import org.dinky.cluster.FlinkCluster;
 import org.dinky.cluster.FlinkClusterInfo;
 import org.dinky.data.dto.ClusterInstanceDTO;
+import org.dinky.data.enums.GatewayType;
 import org.dinky.data.enums.Status;
 import org.dinky.data.exception.BusException;
 import org.dinky.data.exception.DinkyException;
 import org.dinky.data.model.ClusterConfiguration;
 import org.dinky.data.model.ClusterInstance;
 import org.dinky.data.model.Task;
 import org.dinky.gateway.config.GatewayConfig;
-import org.dinky.gateway.enums.GatewayType;
 import org.dinky.gateway.exception.GatewayException;
 import org.dinky.gateway.model.FlinkClusterConfig;
 import org.dinky.gateway.result.GatewayResult;

diff --git a/dinky-admin/src/main/java/org/dinky/service/impl/TaskServiceImpl.java b/dinky-admin/src/main/java/org/dinky/service/impl/TaskServiceImpl.java
@@ -31,6 +31,7 @@
 import org.dinky.data.dto.TaskDTO;
 import org.dinky.data.dto.TaskRollbackVersionDTO;
 import org.dinky.data.dto.TaskSubmitDto;
+import org.dinky.data.enums.GatewayType;
 import org.dinky.data.enums.JobLifeCycle;
 import org.dinky.data.enums.JobStatus;
 import org.dinky.data.enums.ProcessStepType;
@@ -61,7 +62,6 @@
 import org.dinky.function.compiler.CustomStringJavaCompiler;
 import org.dinky.function.pool.UdfCodePool;
 import org.dinky.function.util.UDFUtil;
-import org.dinky.gateway.enums.GatewayType;
 import org.dinky.gateway.enums.SavePointStrategy;
 import org.dinky.gateway.enums.SavePointType;
 import org.dinky.gateway.model.FlinkClusterConfig;

diff --git a/dinky-admin/src/main/java/org/dinky/service/task/FlinkSqlEnvTask.java b/dinky-admin/src/main/java/org/dinky/service/task/FlinkSqlEnvTask.java
@@ -23,10 +23,10 @@
 import org.dinky.config.Dialect;
 import org.dinky.data.annotations.SupportDialect;
 import org.dinky.data.dto.TaskDTO;
+import org.dinky.data.enums.GatewayType;
 import org.dinky.data.exception.NotSupportExecuteExcepition;
 import org.dinky.data.exception.NotSupportExplainExcepition;
 import org.dinky.data.result.SqlExplainResult;
-import org.dinky.gateway.enums.GatewayType;
 import org.dinky.job.JobManager;
 import org.dinky.job.JobResult;
 import org.dinky.service.TaskService;

diff --git a/dinky-admin/src/main/java/org/dinky/service/task/FlinkSqlTask.java b/dinky-admin/src/main/java/org/dinky/service/task/FlinkSqlTask.java
@@ -23,8 +23,8 @@
 import org.dinky.config.Dialect;
 import org.dinky.data.annotations.SupportDialect;
 import org.dinky.data.dto.TaskDTO;
+import org.dinky.data.enums.GatewayType;
 import org.dinky.data.result.SqlExplainResult;
-import org.dinky.gateway.enums.GatewayType;
 import org.dinky.job.JobManager;
 import org.dinky.job.JobResult;
 import org.dinky.service.TaskService;

diff --git a/dinky-admin/src/main/java/org/dinky/utils/FlinkConfigOptionsUtils.java b/dinky-admin/src/main/java/org/dinky/utils/FlinkConfigOptionsUtils.java
@@ -78,7 +78,6 @@ public static List<FlinkConfigOption> loadOptionsByClassName(String name) {
                 configList.add(config);
             }
         } catch (ClassNotFoundException ignored) {
-            logger.warning("Could not get config option, class not found: " + name);
         }
         return configList;
     }

diff --git a/dinky-admin/src/main/resources/dinky-loader/FlinkConfClass b/dinky-admin/src/main/resources/dinky-loader/FlinkConfClass
@@ -27,6 +27,8 @@ org.apache.flink.configuration.NettyShuffleEnvironmentOptions
 org.apache.flink.configuration.RestartStrategyOptions
 org.apache.flink.streaming.api.environment.ExecutionCheckpointingOptions
 org.apache.flink.yarn.configuration.YarnConfigOptions
+org.apache.flink.configuration.YarnConfigOptions
 org.apache.flink.kubernetes.configuration.KubernetesConfigOptions
+org.apache.flink.configuration.KubernetesConfigOptions
 org.apache.flink.python.PythonOptions
-org.dinky.constant.CustomerConfigureOptions
+org.dinky.constant.CustomerConfigureOptions
diff --git a/dinky-app/dinky-app-base/src/main/java/org/dinky/app/flinksql/Submitter.java b/dinky-app/dinky-app-base/src/main/java/org/dinky/app/flinksql/Submitter.java
@@ -29,6 +29,7 @@
 import org.dinky.constant.FlinkSQLConstant;
 import org.dinky.data.app.AppParamConfig;
 import org.dinky.data.app.AppTask;
+import org.dinky.data.enums.GatewayType;
 import org.dinky.data.model.SystemConfiguration;
 import org.dinky.executor.Executor;
 import org.dinky.executor.ExecutorConfig;
@@ -172,9 +173,9 @@ private static void loadDep(String type, Integer taskId, ExecutorConfig executor
             return;
         }
 
-        if ("kubernetes-application".equals(type)) {
+        if (GatewayType.get(type).isKubernetesApplicationMode()) {
             try {
-                String httpJar = "http://" + dinkyAddr + "/download/downloadDepJar/" + taskId;
+                String httpJar = dinkyAddr + "/download/downloadDepJar/" + taskId;
                 log.info("下载依赖 http-url为：{}", httpJar);
                 String flinkHome = System.getenv("FLINK_HOME");
                 String usrlib = flinkHome + "/usrlib";
@@ -214,7 +215,6 @@ private static void loadDep(String type, Integer taskId, ExecutorConfig executor
                     }
                 }
             } catch (IOException e) {
-                log.error("");
                 throw new RuntimeException(e);
             }
         }

diff --git a/dinky-app/dinky-app-base/src/main/java/org/dinky/app/util/FlinkAppUtil.java b/dinky-app/dinky-app-base/src/main/java/org/dinky/app/util/FlinkAppUtil.java
@@ -107,8 +107,8 @@ public static void monitorFlinkTask(JobClient jobClient, int taskId) {
     private static void sendHook(int taskId, String jobId, int reTryCount) {
         String dinkyAddr = SystemConfiguration.getInstances().getDinkyAddr().getValue();
         try {
-            String url = StrFormatter.format(
-                    "http://{}/api/jobInstance/hookJobDone?taskId={}&jobId={}", dinkyAddr, taskId, jobId);
+            String url =
+                    StrFormatter.format("{}/api/jobInstance/hookJobDone?taskId={}&jobId={}", dinkyAddr, taskId, jobId);
             String resultStr = HttpUtil.get(url);
             // TODO 这里应该使用Result实体类，但是Result.class不在comm里，迁移改动太大，暂时不搞
             String code = JsonUtils.parseObject(resultStr).get("code").toString();

diff --git a/.../org/dinky/gateway/enums/GatewayType.java → ...ava/org/dinky/data/enums/GatewayType.java b/.../org/dinky/gateway/enums/GatewayType.java → ...ava/org/dinky/data/enums/GatewayType.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.dinky.gateway.enums;
+package org.dinky.data.enums;
 
 import org.dinky.assertion.Asserts;
 
@@ -122,4 +122,14 @@ public boolean isApplicationMode() {
                 return false;
         }
     }
+
+    public boolean isKubernetesApplicationMode() {
+        switch (this) {
+            case KUBERNETES_APPLICATION:
+            case KUBERNETES_APPLICATION_OPERATOR:
+                return true;
+            default:
+                return false;
+        }
+    }
 }
diff --git a/dinky-common/src/main/resources/i18n/messages_en_US.properties b/dinky-common/src/main/resources/i18n/messages_en_US.properties
@@ -191,7 +191,7 @@ sys.maven.settings.repositoryPassword.note=Maven private server authentication p
 sys.env.settings.pythonHome=Python Env variables
 sys.env.settings.pythonHome.note=Python environment variables, used to submit Python tasks and build Python Udf
 sys.env.settings.dinkyAddr=Dinky Address
-sys.env.settings.dinkyAddr.note=The address must be the same as the address configured in the Dinky Application background url
+sys.env.settings.dinkyAddr.note=This address is an accessible Dinky address, such as http://127.0.0.1:8888
 sys.env.settings.jobResendDiffSecond=Alert anti-resend interval
 sys.env.settings.jobResendDiffSecond.note=During this interval, when the Alert information sent reaches the configured value of [Maximum number of alarm resend prevention], after reaching the threshold, the Alert information will no longer be sent; unit: seconds
 sys.env.settings.diffMinuteMaxSendCount=Maximum number of alarms to prevent resending