Merge remote-tracking branch 'origin/resolve_fence_to_rm' into resolv…

…e_fence_to_rm

README.md

@@ -144,7 +144,6 @@ Contributors are welcomed to join the Seata project. Please check [CONTRIBUTING]
 * [Seata GoLang](https://github.com/apache/incubator-seata-go) - Seata GoLang client and server
 * [Seata Samples](https://github.com/apache/incubator-seata-samples) - Samples for Seata
 * [Seata GoLang Simples](https://github.com/apache/incubator-seata-go-samples) - Samples for Seata GoLang
-* [Seata Docker](https://github.com/seata/fescar-docker) - Seata integration with docker
 * [Seata K8s](https://github.com/apache/incubator-seata-k8s) - Seata integration with k8s
 * [Seata CLI](https://github.com/apache/incubator-seata-ctl) - CLI tool for Seata
 * [Awesome Seata](https://github.com/seata/awesome-fescar) - Seata's slides and video address in meetup

changes/en-us/2.x.md

@@ -15,6 +15,7 @@ Add changes here for all PR submitted to the 2.x branch.
 - [[#6121](https://github.com/apache/incubator-seata/pull/6121)] fix the branch transaction order error when rolling back
 - [[#6182](https://github.com/apache/incubator-seata/pull/6182)] fix guava-32.0.0-jre.jar zip file is empty in ci
 - [[#6196](https://github.com/apache/incubator-seata/pull/6196)] fix asf config file format error
+- [[#6204](https://github.com/apache/incubator-seata/pull/6204)] fix the problem that The incorrect configuration needs to be fixed
 
 ### optimize:
 - [[#6031](https://github.com/apache/incubator-seata/pull/6031)] add a check for the existence of the undolog table
@@ -39,10 +40,12 @@ Add changes here for all PR submitted to the 2.x branch.
 - [[#6192](https://github.com/apache/incubator-seata/pull/6192)] remove the useless file
 - [[#6194](https://github.com/apache/incubator-seata/pull/6194)] fix asf.yaml parse error
 - [[#5399](https://github.com/apache/incubator-seata/pull/5399)] optimizing branch register resource only at RM server end
+- [[#6154](https://github.com/apache/incubator-seata/pull/6154)] console log optimize for "kubectl logs -f"
 - [[#6116](https://github.com/apache/incubator-seata/pull/6116)] rewrite NettyPoolKey's hashcode and equals to fix duplicate construction of channel object pools
 - [[#6195](https://github.com/apache/incubator-seata/pull/6195)] update the url in change log to apache/incubator-seata
 - [[#6200](https://github.com/apache/incubator-seata/pull/6200)] cancel required_status_checks
 - [[#6201](https://github.com/apache/incubator-seata/pull/6201)] restore required_status_checks kept to remove context validation
+- [[#6218](https://github.com/apache/incubator-seata/pull/6218)] remove Seata-Docker link
 
 ### security:
 - [[#6069](https://github.com/apache/incubator-seata/pull/6069)] Upgrade Guava dependencies to fix security vulnerabilities
@@ -74,7 +77,9 @@ Thanks to these contributors for their code commits. Please report an unintended
 - [xingfudeshi](https://github.com/xingfudeshi)
 - [PleaseGiveMeTheCoke](https://github.com/PleaseGiveMeTheCoke)
 - [sunrui1225](https://github.com/sunrui1225)
+- [PeppaO](https://github.com/PeppaO)
 - [AlbumenJ](https://github.com/AlbumenJ)
+- [dreamskyvision](https://github.com/dreamskyvision)
 
 
 Also, we receive many valuable issues, questions and advices from our community. Thanks for you all.

changes/zh-cn/2.x.md

@@ -15,6 +15,7 @@
 - [[#6121](https://github.com/apache/incubator-seata/pull/6121)] 修复回滚分支事务时没有按照时间排序的问题
 - [[#6182](https://github.com/apache/incubator-seata/pull/6182)] 修复在ci中guava-32.0.0-jre.jar zip文件为空的问题
 - [[#6196](https://github.com/apache/incubator-seata/pull/6196)] 修复asf配置格式错误的问题
+- [[#6204](https://github.com/apache/incubator-seata/pull/6204)] 修复错误配置问题
 
 ### optimize:
 - [[#6031](https://github.com/apache/incubator-seata/pull/6031)] 添加undo_log表的存在性校验
@@ -38,10 +39,13 @@
 - [[#6192](https://github.com/apache/incubator-seata/pull/6192)] 移除无用文件
 - [[#6194](https://github.com/apache/incubator-seata/pull/6194)] 修复 asf.yaml 解析错误问题
 - [[#5399](https://github.com/apache/incubator-seata/pull/5399)] 分支注册只在RM端
+- [[#6116](https://github.com/seata/seata/pull/6116)] 重写NettyPoolKey的hashcode和equals，修复了channel对象池重复构建问题
+- [[#6154](https://github.com/apache/incubator-seata/pull/6154)] 控制台日志优化 "kubectl logs -f"
 - [[#6116](https://github.com/apache/incubator-seata/pull/6116)] 重写NettyPoolKey的hashcode和equals，修复了channel对象池重复构建问题
 - [[#6195](https://github.com/apache/incubator-seata/pull/6195)] 更新 change log 中的 seata url 为 apache/incubator-seata
 - [[#6200](https://github.com/apache/incubator-seata/pull/6200)] 去除required_status_checks检查
 - [[#6201](https://github.com/apache/incubator-seata/pull/6201)] 恢复required_status_checks但去除context校验
+- [[#6218](https://github.com/apache/incubator-seata/pull/6218)] 移除Seata-Docker链接
 
 
 ### security:
@@ -73,7 +77,9 @@
 - [xingfudeshi](https://github.com/xingfudeshi)
 - [PleaseGiveMeTheCoke](https://github.com/PleaseGiveMeTheCoke)
 - [sunrui1225](https://github.com/sunrui1225)
+- [PeppaO](https://github.com/PeppaO)
 - [AlbumenJ](https://github.com/AlbumenJ)
+- [dreamskyvision](https://github.com/dreamskyvision)
 
 
 同时，我们收到了社区反馈的很多有价值的issue和建议，非常感谢大家。

distribution/bin/seata-server.sh

@@ -193,8 +193,8 @@ while [[ $# -gt 0 ]]; do
 done
 
 function start_server() {
-  echo "$JAVACMD ${JAVA_OPT} ${NEW_ARGS} >> /dev/null 2>&1 &"
-  nohup $JAVACMD ${JAVA_OPT} ${NEW_ARGS} >> /dev/null 2>&1 &
+  echo "$JAVACMD ${JAVA_OPT} ${NEW_ARGS} &"
+  nohup $JAVACMD ${JAVA_OPT} ${NEW_ARGS} &
   echo "seata-server is starting, you can check the ${LOG_HOME}/ *.log"
 }
 

script/config-center/config.txt

@@ -131,7 +131,7 @@ server.enableParallelHandleBranch=false
 server.applicationDataLimit=64000
 server.applicationDataLimitCheck=false
 
-server.raft.cluster=127.0.0.1:7091,127.0.0.1:7092,127.0.0.1:7093
+server.raft.server-addr=127.0.0.1:7091,127.0.0.1:7092,127.0.0.1:7093
 server.raft.snapshotInterval=600
 server.raft.applyBatch=32
 server.raft.maxAppendBufferSize=262144

server/src/main/java/io/seata/server/spring/listener/ServerApplicationListener.java

@@ -23,6 +23,7 @@
 import io.seata.spring.boot.autoconfigure.SeataCoreEnvironmentPostProcessor;
 import io.seata.spring.boot.autoconfigure.SeataServerEnvironmentPostProcessor;
 import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent;
+import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.boot.context.logging.LoggingApplicationListener;
 import org.springframework.context.ApplicationEvent;
 import org.springframework.context.event.GenericApplicationListener;
@@ -43,11 +44,16 @@ public class ServerApplicationListener implements GenericApplicationListener {
     @Override
     public boolean supportsEventType(ResolvableType eventType) {
         return eventType.getRawClass() != null
-                && ApplicationEnvironmentPreparedEvent.class.isAssignableFrom(eventType.getRawClass());
+                && (ApplicationEnvironmentPreparedEvent.class.isAssignableFrom(eventType.getRawClass()) ||
+                ApplicationReadyEvent.class.isAssignableFrom(eventType.getRawClass()));
     }
 
     @Override
     public void onApplicationEvent(ApplicationEvent event) {
+        if (event instanceof ApplicationReadyEvent) {
+            System.setProperty("ENV_LOG_SYS_BOOT_COMPLETED", "true");
+            return;
+        }
         if (!(event instanceof ApplicationEnvironmentPreparedEvent)) {
             return;
         }

server/src/main/resources/application.example.yml

@@ -125,20 +125,6 @@ seata:
       address-wait-time: 3000
 
   server:
-    raft:
-      group: default
-      cluster:
-      snapshot-interval: 600
-      apply-batch: 32
-      max-append-bufferSize: 262144
-      max-replicator-inflight-msgs: 256
-      disruptor-buffer-size: 16384
-      election-timeout-ms: 1000
-      reporter-enabled: false
-      reporter-initial-delay: 60
-      serialization: jackson
-      compressor: none
-      sync: true # sync log&snapshot to disk
     service-port: 8091 #If not configured, the default is '${server.port} + 1000'
     max-commit-retry-timeout: -1
     max-rollback-retry-timeout: -1

server/src/main/resources/logback/console-appender.xml

@@ -23,6 +23,15 @@
                     defaultValue="%clr(%d{HH:mm:ss.SSS}){faint} %clr(%5p) %clr(---){faint} %clr([%25.25t]){faint} %clr([%-30.30logger]){cyan} %clr([%20.20M]){faint}  %clr([%X{X-TX-XID:-}]){faint} %clr(:){faint} %m%n%wEx2"/>
 
     <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
+            <evaluator>
+                <expression>
+                    return !"true".equals(System.getProperty("ENV_LOG_SYS_BOOT_COMPLETED"));
+                </expression>
+            </evaluator>
+            <OnMatch>ACCEPT</OnMatch>
+            <OnMismatch>DENY</OnMismatch>
+        </filter>
         <encoder>
             <Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
             <charset>UTF-8</charset>