opt

Author: funky-eyes

rm-datasource/src/main/java/io/seata/rm/datasource/xa/DataSourceProxyXA.java

@@ -56,11 +56,6 @@ public DataSourceProxyXA(DataSource dataSource, String resourceGroupId) {
         this.branchType = BranchType.XA;
         JdbcUtils.initDataSourceResource(this, dataSource, resourceGroupId);
         if (DBType.MYSQL.name().equalsIgnoreCase(dbType)) {
-            Optional.ofNullable(DefaultResourceManager.get().getResourceManager(BranchType.XA)).ifPresent(resourceManager -> {
-                if (resourceManager instanceof ResourceManagerXA) {
-                    ((ResourceManagerXA)resourceManager).initXaTwoPhaseTimeoutChecker();
-                }
-            });
             try (Connection connection = dataSource.getConnection();
                 PreparedStatement preparedStatement = connection.prepareStatement("SELECT VERSION()");
                 ResultSet versionResult = preparedStatement.executeQuery()) {
@@ -78,6 +73,11 @@ public DataSourceProxyXA(DataSource dataSource, String resourceGroupId) {
         } else if (DBType.MARIADB.name().equalsIgnoreCase(dbType)) {
             setShouldBeHeld(true);
         }
+        Optional.ofNullable(DefaultResourceManager.get().getResourceManager(BranchType.XA)).ifPresent(resourceManager -> {
+            if (resourceManager instanceof ResourceManagerXA) {
+                ((ResourceManagerXA)resourceManager).initXaTwoPhaseTimeoutChecker();
+            }
+        });
         //Set the default branch type to 'XA' in the RootContext.
         RootContext.setDefaultBranchType(this.getBranchType());
     }

rm-datasource/src/main/java/io/seata/rm/datasource/xa/ResourceManagerXA.java

@@ -75,18 +75,20 @@ public void initXaTwoPhaseTimeoutChecker() {
                         xaTwoPhaseTimeoutChecker.scheduleAtFixedRate(() -> {
                             for (Map.Entry<String, Resource> entry : dataSourceCache.entrySet()) {
                                 BaseDataSourceResource resource = (BaseDataSourceResource)entry.getValue();
-                                if (resource instanceof DataSourceProxyXA) {
-                                    Map<String, ConnectionProxyXA> keeper = resource.getKeeper();
-                                    for (Map.Entry<String, ConnectionProxyXA> connectionEntry : keeper.entrySet()) {
-                                        ConnectionProxyXA connection = connectionEntry.getValue();
-                                        long now = System.currentTimeMillis();
-                                        synchronized (connection) {
-                                            if (connection.getPrepareTime() != null
-                                                && now - connection.getPrepareTime() > TWO_PHASE_HOLD_TIMEOUT) {
-                                                try {
-                                                    connection.closeForce();
-                                                } catch (SQLException e) {
-                                                    LOGGER.info("Force close the xa physical connection fail", e);
+                                if (resource.isShouldBeHeld()) {
+                                    if (resource instanceof DataSourceProxyXA) {
+                                        Map<String, ConnectionProxyXA> keeper = resource.getKeeper();
+                                        for (Map.Entry<String, ConnectionProxyXA> connectionEntry : keeper.entrySet()) {
+                                            ConnectionProxyXA connection = connectionEntry.getValue();
+                                            long now = System.currentTimeMillis();
+                                            synchronized (connection) {
+                                                if (connection.getPrepareTime() != null
+                                                    && now - connection.getPrepareTime() > TWO_PHASE_HOLD_TIMEOUT) {
+                                                    try {
+                                                        connection.closeForce();
+                                                    } catch (SQLException e) {
+                                                        LOGGER.info("Force close the xa physical connection fail", e);
+                                                    }
                                                 }
                                             }
                                         }