optimize: optimize the default value of the switch (apache#4591)

dongYES · May 8, 2022 · 1a3b6bc · 1a3b6bc
1 parent 8a12ddc
commit 1a3b6bc
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 6 deletions.
diff --git a/changes/1.5.0.md b/changes/1.5.0.md
@@ -220,6 +220,7 @@ Seata 是一款开源的分布式事务解决方案，提供高性能和简单
   - [[#4551](https://github.com/seata/seata/pull/4551)] 优化 metrics rt 统计问题
   - [[#4574](https://github.com/seata/seata/pull/4574)] 支持 accessKey/secretKey 配置自动注入
   - [[#4583](https://github.com/seata/seata/pull/4583)] DefaultAuthSigner的默认签名加密方法替换为HmacSHA256
+  - [[#4591](https://github.com/seata/seata/pull/4591)] 优化开关默认值
 
 ### test：
 

diff --git a/changes/en-us/1.5.0.md b/changes/en-us/1.5.0.md
@@ -224,6 +224,9 @@
   - [[#4551](https://github.com/seata/seata/pull/4551)] optimize metrics rt statistics
   - [[#4574](https://github.com/seata/seata/pull/4574)] support accessKey/secretKey auto configuration
   - [[#4583](https://github.com/seata/seata/pull/4583)] use HmacSHA256 instead of HmacSHA1 for ram signature
+  - [[#4591](https://github.com/seata/seata/pull/4591)] optimize the default value of the switch
+
+
 
 
 

diff --git a/common/src/main/java/io/seata/common/DefaultValues.java b/common/src/main/java/io/seata/common/DefaultValues.java
@@ -30,7 +30,7 @@ public interface DefaultValues {
     int DEFAULT_TM_DEGRADE_CHECK_PERIOD = 2000;
     int DEFAULT_CLIENT_REPORT_RETRY_COUNT = 5;
     boolean DEFAULT_CLIENT_REPORT_SUCCESS_ENABLE = false;
-    boolean DEFAULT_CLIENT_TABLE_META_CHECK_ENABLE = false;
+    boolean DEFAULT_CLIENT_TABLE_META_CHECK_ENABLE = true;
     long DEFAULT_TABLE_META_CHECKER_INTERVAL = 60000L;
     boolean DEFAULT_TM_DEGRADE_CHECK = false;
     boolean DEFAULT_CLIENT_SAGA_BRANCH_REGISTER_ENABLE = false;

diff --git a/script/config-center/config.txt b/script/config-center/config.txt
@@ -35,7 +35,7 @@ client.rm.lock.retryInterval=10
 client.rm.lock.retryTimes=30
 client.rm.lock.retryPolicyBranchRollbackOnConflict=true
 client.rm.reportRetryCount=5
-client.rm.tableMetaCheckEnable=false
+client.rm.tableMetaCheckEnable=true
 client.rm.tableMetaCheckerInterval=60000
 client.rm.sqlParserType=druid
 client.rm.reportSuccessEnable=false
@@ -120,7 +120,7 @@ server.rollbackRetryTimeoutUnlockEnable=false
 server.distributedLockExpireTime=10000
 server.xaerNotaRetryTimeout=60000
 server.session.branchAsyncQueueSize=5000
-server.session.enableBranchAsyncRemove=true
+server.session.enableBranchAsyncRemove=false
 
 #Metrics configuration, only for the server
 metrics.enabled=false

diff --git a/...nfigure-client/src/test/java/io/seata/spring/boot/autoconfigure/ClientPropertiesTest.java b/...nfigure-client/src/test/java/io/seata/spring/boot/autoconfigure/ClientPropertiesTest.java
@@ -73,7 +73,7 @@ public void testLockProperties() {
     public void testRmProperties() {
         assertEquals(10000, context.getBean(RmProperties.class).getAsyncCommitBufferLimit());
         assertEquals(5, context.getBean(RmProperties.class).getReportRetryCount());
-        assertFalse(context.getBean(RmProperties.class).isTableMetaCheckEnable());
+        assertTrue(context.getBean(RmProperties.class).isTableMetaCheckEnable());
         assertFalse(context.getBean(RmProperties.class).isReportSuccessEnable());
         assertEquals(60000L,context.getBean(RmProperties.class).getTableMetaCheckerInterval());
         assertFalse(context.getBean(RmProperties.class).isSagaRetryPersistModeUpdate());

diff --git a/.../java/io/seata/spring/boot/autoconfigure/properties/server/session/SessionProperties.java b/.../java/io/seata/spring/boot/autoconfigure/properties/server/session/SessionProperties.java
@@ -38,7 +38,7 @@ public class SessionProperties {
     /**
      * enable to asynchronous remove branchSession
      */
-    private Boolean enableBranchAsyncRemove = true;
+    private Boolean enableBranchAsyncRemove = false;
 
     public Integer getBranchAsyncQueueSize() {
         return branchAsyncQueueSize;

diff --git a/server/src/main/resources/application.example.yml b/server/src/main/resources/application.example.yml
@@ -114,7 +114,7 @@ seata:
       log-delete-period: 86400000
     session:
       branch-async-queue-size: 5000 #branch async remove queue size
-      enable-branch-async-remove: true #enable to asynchronous remove branchSession
+      enable-branch-async-remove: false #enable to asynchronous remove branchSession
   store:
     # support: file 、 db 、 redis
     mode: file