change conf

apache · Oct 21, 2024 · b395bd3 · b395bd3
1 parent 6d64588
commit b395bd3
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 12 deletions.
diff --git a/...eampark-registry-api/src/main/java/org/apache/streampark/registry/api/RegistryClient.java b/...eampark-registry-api/src/main/java/org/apache/streampark/registry/api/RegistryClient.java
@@ -41,10 +41,6 @@ public class RegistryClient {
 
     public RegistryClient(Registry registry) {
         this.registry = registry;
-        // TODO: remove this
-        if (!registry.exists(RegistryNodeType.CONSOLE_SERVER.getRegistryPath())) {
-            registry.put(RegistryNodeType.CONSOLE_SERVER.getRegistryPath(), EMPTY);
-        }
     }
 
     /**

diff --git a/...mpark-console-registry/streampark-registry-core/src/test/resources/application-mysql.yaml b/...mpark-console-registry/streampark-registry-core/src/test/resources/application-mysql.yaml
@@ -26,8 +26,8 @@ spring:
 
 registry:
   type: jdbc
-  heartbeat-refresh-interval: 1s
-  session-timeout: 3s
+  heartbeat-refresh-interval: 3s
+  session-timeout: 60s
 
 network:
   # network interface preferred like eth0, default: empty

diff --git a/...-console-registry/streampark-registry-core/src/test/resources/application-postgresql.yaml b/...-console-registry/streampark-registry-core/src/test/resources/application-postgresql.yaml
@@ -23,8 +23,8 @@ spring:
 
 registry:
   type: jdbc
-  heartbeat-refresh-interval: 1s
-  session-timeout: 3s
+  heartbeat-refresh-interval: 3s
+  session-timeout: 60s
 
 network:
   # network interface preferred like eth0, default: empty

diff --git a/...mpark-console/streampark-console-service/src/main/assembly/script/schema/mysql-schema.sql b/...mpark-console/streampark-console-service/src/main/assembly/script/schema/mysql-schema.sql
@@ -605,7 +605,7 @@ create table `t_spark_app` (
   `jar_check_sum` bigint default null,
   `app_properties` text collate utf8mb4_general_ci comment 'Arbitrary Spark configuration property in key=value format (e.g. spark.driver.cores=1)',
   `app_args` text collate utf8mb4_general_ci comment 'Arguments passed to the main method of your main class',
-  `app_id` varchar(64) collate utf8mb4_general_ci default null comment '(1)application_id on yarn(2)driver_pod_name on k8s',
+  `cluster_id` varchar(64) collate utf8mb4_general_ci default null comment '(1)application_id on yarn(2)driver_pod_name on k8s',
   `yarn_queue` varchar(128) collate utf8mb4_general_ci default null,
   `k8s_master_url` varchar(128) collate utf8mb4_general_ci default null,
   `k8s_container_image` varchar(128) collate utf8mb4_general_ci default null,

diff --git a/...vice/src/main/java/org/apache/streampark/console/core/registry/ConsoleRegistryClient.java b/...vice/src/main/java/org/apache/streampark/console/core/registry/ConsoleRegistryClient.java
@@ -101,7 +101,7 @@ public void addConsoleNodePath(String path, RegistryNodeType nodeType) {
             }
             distributedTaskService.addServer(serverHost);
         } catch (Exception e) {
-            log.error("{} server failover failed, host:{}", nodeType, serverHost, e);
+            log.error("{} server add failed, host:{}", nodeType, serverHost, e);
         }
     }
 

diff --git a/streampark-console/streampark-console-service/src/test/resources/application-test.yml b/streampark-console/streampark-console-service/src/test/resources/application-test.yml
@@ -59,8 +59,8 @@ streampark:
 registry:
   # default using jdbc as registry
   type: jdbc
-  heartbeat-refresh-interval: 1s
-  session-timeout: 3s
+  heartbeat-refresh-interval: 3s
+  session-timeout: 60s
 
 network:
   # network interface preferred like eth0, default: empty