[Improvement-17646][JdbcRegistry] Using transaction in JdbcRegistryDataManager

Author: ruanwenjun

docs/docs/en/guide/installation/registry-plugins/jdbc.md

@@ -11,25 +11,13 @@ configuration same as DolphinScheduler in api'yaml default.
 
 - If you use Postgresql you can directly execute the sql script `src/main/resources/postgresql_registry_init.sql`.
 
-2. Change the config
-
-You need to set the registry properties in master/worker/api's application.yml
-
-```yaml
-registry:
-  type: jdbc
-```
-
-After do this two steps, you can start your DolphinScheduler cluster, your cluster will use mysql as registry center to
-store server metadata.
-
 NOTE: You need to add `mysql-connector-java.jar` into DS classpath if you use mysql database, since this plugin will not
 bundle this driver in distribution.
 You can get the detail
 about <a href="https://dolphinscheduler.apache.org/en-us/docs/3.1.2/guide/installation/pseudo-cluster">Initialize the
 Database</a>.
 
-## Optional configuration
+2. Change the config
 
 ```yaml
 registry:
@@ -38,49 +26,5 @@ registry:
   heartbeat-refresh-interval: 3s
   # Once the client's heartbeat is not refresh in this time, the server will consider the client is offline.
   session-timeout: 60s
-  # The hikari configuration, default will use the same datasource pool as DolphinScheduler.
-  hikari-config:
-    jdbc-url: jdbc:mysql://127.0.0.1:3306/dolphinscheduler
-    username: root
-    password: root
-    maximum-pool-size: 5
-    connection-timeout: 9000
-    idle-timeout: 600000
-```
-
-## Use different database configuration for jdbc registry center
-
-You need to set the registry properties in master/worker/api's application.yml
-
-### Use Mysql as registry center
-
-```yaml
-registry:
-  type: jdbc
-  heartbeat-refresh-interval: 3s
-  session-timeout: 60s
-  hikari-config:
-    jdbc-url: jdbc:mysql://127.0.0.1:3306/dolphinscheduler
-    username: root
-    password: root
-    maximum-pool-size: 5
-    connection-timeout: 9000
-    idle-timeout: 600000
-```
-
-### Use Postgresql as registry center
-
-```yaml
-registry:
-  type: jdbc
-  heartbeat-refresh-interval: 3s
-  session-timeout: 60s
-  hikari-config:
-    jdbc-url: jdbc:postgresql://localhost:5432/dolphinscheduler
-    username: root
-    password: root
-    maximum-pool-size: 5
-    connection-timeout: 9000
-    idle-timeout: 600000
 ```
 

docs/docs/zh/guide/installation/registry-plugins/jdbc.md

@@ -10,71 +10,18 @@
 
 - 如果你使用 PostgreSQL，你可以直接执行 SQL 脚本 `src/main/resources/postgresql_registry_init.sql`.
 
+注意: 如果您使用mysql数据库，您需要将 `mysql-connector-java.jar` 添加到 DS 的类路径中，因为这个插件不会在发行版中捆绑此驱动程序。
+
 2. 修改配置
 
 需要在 master/worker/api 的 application.yml 中设置属性
 
-```yaml
-registry:
-  type: jdbc
-```
-
-完成这两步后，你就可以启动你的 DolphinScheduler 集群了，你的集群将使用 MySQL 作为注册中心来存储服务器元数据。
-
-注意: 如果您使用mysql数据库，您需要将 `mysql-connector-java.jar` 添加到 DS 的类路径中，因为这个插件不会在发行版中捆绑此驱动程序。
-
-## 可选配置
-
 ```yaml
 registry:
   type: jdbc
   # Used to schedule refresh the heartbeat.
   heartbeat-refresh-interval: 3s
   # Once the client's heartbeat is not refresh in this time, the server will consider the client is offline.
   session-timeout: 60s
-  # The hikari configuration, default will use the same datasource pool as DolphinScheduler.
-  hikari-config:
-    jdbc-url: jdbc:mysql://127.0.0.1:3306/dolphinscheduler
-    username: root
-    password: root
-    maximum-pool-size: 5
-    connection-timeout: 9000
-    idle-timeout: 600000
-```
-
-## 对 JDBC 注册中心使用不同的数据库配置
-
-需要在 master/worker/api 的 application.yml 中设置属性
-
-### 使用 MySQL 作为注册中心
-
-```yaml
-registry:
-  type: jdbc
-  heartbeat-refresh-interval: 3s
-  session-timeout: 60s
-  hikari-config:
-    jdbc-url: jdbc:mysql://127.0.0.1:3306/dolphinscheduler
-    username: root
-    password: root
-    maximum-pool-size: 5
-    connection-timeout: 9000
-    idle-timeout: 600000
-```
-
-### 使用 PostgreSQL 作为注册中心
-
-```yaml
-registry:
-  type: jdbc
-  heartbeat-refresh-interval: 3s
-  session-timeout: 60s
-  hikari-config:
-    jdbc-url: jdbc:postgresql://localhost:5432/dolphinscheduler
-    username: root
-    password: root
-    maximum-pool-size: 5
-    connection-timeout: 9000
-    idle-timeout: 600000
 ```
 

dolphinscheduler-master/src/test/resources/application.yaml

@@ -43,6 +43,10 @@ mybatis-plus:
 
 registry:
   type: jdbc
+  # Used to schedule refresh the heartbeat.
+  heartbeat-refresh-interval: 3s
+  # Once the client's heartbeat is not refresh in this time, the server will consider the client is offline.
+  session-timeout: 60s
 
 master:
   listen-port: 5678

dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-jdbc/src/main/java/org/apache/dolphinscheduler/plugin/registry/jdbc/JdbcRegistryAutoConfiguration.java

@@ -17,33 +17,24 @@
 
 package org.apache.dolphinscheduler.plugin.registry.jdbc;
 
-import org.apache.dolphinscheduler.plugin.registry.jdbc.mapper.JdbcRegistryClientHeartbeatMapper;
-import org.apache.dolphinscheduler.plugin.registry.jdbc.mapper.JdbcRegistryDataChangeEventMapper;
-import org.apache.dolphinscheduler.plugin.registry.jdbc.mapper.JdbcRegistryDataMapper;
-import org.apache.dolphinscheduler.plugin.registry.jdbc.mapper.JdbcRegistryLockMapper;
 import org.apache.dolphinscheduler.plugin.registry.jdbc.repository.JdbcRegistryClientRepository;
 import org.apache.dolphinscheduler.plugin.registry.jdbc.repository.JdbcRegistryDataChangeEventRepository;
 import org.apache.dolphinscheduler.plugin.registry.jdbc.repository.JdbcRegistryDataRepository;
 import org.apache.dolphinscheduler.plugin.registry.jdbc.repository.JdbcRegistryLockRepository;
 import org.apache.dolphinscheduler.plugin.registry.jdbc.server.IJdbcRegistryServer;
 import org.apache.dolphinscheduler.plugin.registry.jdbc.server.JdbcRegistryServer;
 
-import org.apache.ibatis.session.SqlSessionFactory;
-
 import lombok.extern.slf4j.Slf4j;
 
-import org.mybatis.spring.SqlSessionTemplate;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration;
-import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
-import com.zaxxer.hikari.HikariDataSource;
 
 @Slf4j
 @ComponentScan
@@ -62,13 +53,15 @@ public IJdbcRegistryServer jdbcRegistryServer(JdbcRegistryDataRepository jdbcReg
                                                   JdbcRegistryLockRepository jdbcRegistryLockRepository,
                                                   JdbcRegistryClientRepository jdbcRegistryClientRepository,
                                                   JdbcRegistryDataChangeEventRepository jdbcRegistryDataChangeEventRepository,
-                                                  JdbcRegistryProperties jdbcRegistryProperties) {
+                                                  JdbcRegistryProperties jdbcRegistryProperties,
+                                                  TransactionTemplate transactionTemplate) {
         return new JdbcRegistryServer(
                 jdbcRegistryDataRepository,
                 jdbcRegistryLockRepository,
                 jdbcRegistryClientRepository,
                 jdbcRegistryDataChangeEventRepository,
-                jdbcRegistryProperties);
+                jdbcRegistryProperties,
+                transactionTemplate);
     }
 
     @Bean
@@ -79,44 +72,4 @@ public JdbcRegistry jdbcRegistry(JdbcRegistryProperties jdbcRegistryProperties,
         return jdbcRegistry;
     }
 
-    @Bean
-    @ConditionalOnMissingBean
-    public SqlSessionFactory sqlSessionFactory(JdbcRegistryProperties jdbcRegistryProperties) throws Exception {
-        log.info("Initialize jdbcRegistrySqlSessionFactory");
-        MybatisSqlSessionFactoryBean sqlSessionFactoryBean = new MybatisSqlSessionFactoryBean();
-        sqlSessionFactoryBean.setDataSource(new HikariDataSource(jdbcRegistryProperties.getHikariConfig()));
-        return sqlSessionFactoryBean.getObject();
-    }
-
-    @Bean
-    @ConditionalOnMissingBean
-    public SqlSessionTemplate sqlSessionTemplate(SqlSessionFactory jdbcRegistrySqlSessionFactory) {
-        log.info("Initialize jdbcRegistrySqlSessionTemplate");
-        return new SqlSessionTemplate(jdbcRegistrySqlSessionFactory);
-    }
-
-    @Bean
-    public JdbcRegistryDataMapper jdbcRegistryDataMapper(SqlSessionTemplate jdbcRegistrySqlSessionTemplate) {
-        jdbcRegistrySqlSessionTemplate.getConfiguration().addMapper(JdbcRegistryDataMapper.class);
-        return jdbcRegistrySqlSessionTemplate.getMapper(JdbcRegistryDataMapper.class);
-    }
-
-    @Bean
-    public JdbcRegistryLockMapper jdbcRegistryLockMapper(SqlSessionTemplate jdbcRegistrySqlSessionTemplate) {
-        jdbcRegistrySqlSessionTemplate.getConfiguration().addMapper(JdbcRegistryLockMapper.class);
-        return jdbcRegistrySqlSessionTemplate.getMapper(JdbcRegistryLockMapper.class);
-    }
-
-    @Bean
-    public JdbcRegistryDataChangeEventMapper jdbcRegistryDataChangeEventMapper(SqlSessionTemplate jdbcRegistrySqlSessionTemplate) {
-        jdbcRegistrySqlSessionTemplate.getConfiguration().addMapper(JdbcRegistryDataChangeEventMapper.class);
-        return jdbcRegistrySqlSessionTemplate.getMapper(JdbcRegistryDataChangeEventMapper.class);
-    }
-
-    @Bean
-    public JdbcRegistryClientHeartbeatMapper jdbcRegistryClientHeartbeatMapper(SqlSessionTemplate jdbcRegistrySqlSessionTemplate) {
-        jdbcRegistrySqlSessionTemplate.getConfiguration().addMapper(JdbcRegistryClientHeartbeatMapper.class);
-        return jdbcRegistrySqlSessionTemplate.getMapper(JdbcRegistryClientHeartbeatMapper.class);
-    }
-
 }