feature: add console transaction control #7024

xjlgod · 2024-11-22T04:19:26Z

I have registered the PR changes.

Ⅰ. Describe what this PR did

feature: add console transaction control
the origin branch is summer-code_trxOPS
the doc can be seen in https://www.yuque.com/cairusigoudenanpeijiao/izo0ob/nyd5930611b4uag0?singleDoc#

Ⅱ. Does this pull request fix one issue?

Ⅲ. Why don't you add test cases (unit test/integration test)?

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

# Conflicts: # common/src/main/java/org/apache/seata/common/DefaultValues.java

codecov · 2024-12-01T12:31:11Z

Codecov Report

Attention: Patch coverage is 24.88038% with 314 lines in your changes missing coverage. Please review.

Project coverage is 52.43%. Comparing base (2438d77) to head (ec3a0cf).

Files with missing lines	Patch %	Lines
...ata/server/console/impl/AbstractGlobalService.java	28.57%	59 Missing and 1 partial ⚠️
...ata/server/console/impl/AbstractBranchService.java	38.70%	31 Missing and 7 partials ⚠️
...che/seata/server/console/impl/AbstractService.java	56.33%	27 Missing and 4 partials ⚠️
...g/apache/seata/server/coordinator/DefaultCore.java	0.00%	29 Missing and 2 partials ⚠️
...erver/console/impl/db/GlobalLockDBServiceImpl.java	0.00%	19 Missing ⚠️
...er/console/controller/GlobalSessionController.java	5.26%	18 Missing ⚠️
...r/console/impl/file/GlobalLockFileServiceImpl.java	10.52%	17 Missing ⚠️
...console/impl/redis/GlobalLockRedisServiceImpl.java	0.00%	17 Missing ⚠️
...rver/console/aop/GlobalExceptionHandlerAdvice.java	14.28%	12 Missing ⚠️
...er/console/controller/BranchSessionController.java	7.69%	12 Missing ⚠️
... and 16 more

Additional details and impacted files

@@             Coverage Diff              @@
##                2.x    #7024      +/-   ##
============================================
- Coverage     52.67%   52.43%   -0.24%     
- Complexity     6697     6745      +48     
============================================
  Files          1134     1140       +6     
  Lines         40310    40719     +409     
  Branches       4722     4791      +69     
============================================
+ Hits          21234    21353     +119     
- Misses        17043    17321     +278     
- Partials       2033     2045      +12

Files with missing lines	Coverage Δ
...in/java/org/apache/seata/common/result/Result.java	`0.00% <ø> (ø)`
...java/org/apache/seata/core/model/BranchStatus.java	`100.00% <100.00%> (ø)`
...java/org/apache/seata/core/model/GlobalStatus.java	`97.67% <100.00%> (-2.33%)`	⬇️
...er/console/impl/db/BranchSessionDBServiceImpl.java	`0.00% <ø> (ø)`
...er/console/impl/db/GlobalSessionDBServiceImpl.java	`0.00% <ø> (ø)`
...onsole/impl/file/GlobalSessionFileServiceImpl.java	`82.35% <100.00%> (ø)`
...org/apache/seata/server/session/SessionHolder.java	`56.05% <ø> (+0.28%)`	⬆️
...ver/storage/db/session/DataBaseSessionManager.java	`59.45% <ø> (ø)`
...ver/storage/redis/session/RedisSessionManager.java	`62.85% <ø> (ø)`
...sole/impl/redis/BranchSessionRedisServiceImpl.java	`0.00% <0.00%> (ø)`
... and 25 more

... and 10 files with indirect coverage changes

…e/console-trx

# Conflicts: # server/src/test/java/org/apache/seata/server/session/FileSessionManagerTest.java

…e/console-trx

funky-eyes · 2025-01-02T01:36:53Z

common/src/main/java/org/apache/seata/common/result/Result.java

@@ -26,6 +26,8 @@ public class Result<T>  implements Serializable {

    public static final String SUCCESS_CODE = "200";
    public static final String SUCCESS_MSG = "success";
+    public static final String FAIL_CODE = "400";


400异常一般是指client异常状态码，服务端状态码应该取5xx的状态码
A 400 error generally refers to a client-side error status code, while server-side errors should use 5xx status codes.

funky-eyes · 2025-01-02T02:19:35Z

server/src/main/java/org/apache/seata/server/coordinator/AbstractCore.java

+    }
+
+    @Override
+    public BranchDeleteResponse branchDelete(GlobalSession globalSession, BranchSession branchSession) throws TransactionException {


BranchDeleteRequest 为什么要下发这个请求到client？如果需要发送该请求需要判断client版本是否支持该请求，我建议改为对应行为的request，比如二阶段回滚或提交的请求到client
Why is the BranchDeleteRequest sent to the client? If this request needs to be sent, it should be determined whether the client version supports it. I suggest changing it to a corresponding behavior request, such as a two-phase rollback or commit request, sent to the client.

I have delete BranchDeleteRequest realted code.

funky-eyes · 2025-01-02T02:20:30Z

server/src/main/java/org/apache/seata/server/coordinator/AbstractCore.java

+            return (BranchDeleteResponse) remotingServer.sendSyncRequest(
+                    branchSession.getResourceId(), branchSession.getClientId(), request, branchSession.isAT());
+        } catch (TimeoutException e) {
+            throw new BranchTransactionException(FailedToSendBranchDeleteRequest, String.format("Send branch delete failed," +


不需要这个状态，如果增加了版本判断，只可能出现timeout，timeout就是timeout，已经等于是失败了，就不需要这个状态了
This status is not needed. If version checking is added, the only possible outcome would be a timeout. A timeout is essentially a failure, so this status is unnecessary.

funky-eyes · 2025-01-02T02:21:41Z

server/src/main/java/org/apache/seata/server/coordinator/DefaultCoordinator.java

+     * get default core
+     * @return
+     */
+    public DefaultCore getCore() {


为什么添加这个方法？
Why add this method?

funky-eyes · 2025-01-02T02:31:02Z

server/src/main/java/org/apache/seata/server/coordinator/DefaultCore.java

@@ -362,7 +396,7 @@ public boolean doGlobalRollback(GlobalSession globalSession, boolean retrying) t

        // In db mode, lock and branch data residual problems may occur.
        // Therefore, execution needs to be delayed here and cannot be executed synchronously.
-        if (success) {
+        if (success && globalSession.getBranchSessions().isEmpty()) {


为什么要额外加一个branchsessions是否为空？二阶段下发只要是没有异常，正常回滚了，该branchsessions肯定是为空的
Why add an extra check for whether branchsessions is empty? In a two-phase commit, as long as there are no exceptions and the rollback is performed normally, the branchsessions should definitely be empty.

funky-eyes · 2025-01-02T02:34:15Z

server/src/main/java/org/apache/seata/server/session/BranchSession.java

@@ -423,6 +423,7 @@ private int calBranchSessionSize(byte[] resourceIdBytes, byte[] lockKeyBytes, by
            + 4 // applicationDataBytes.length
            + 4 // xidBytes.size
            + 1 // statusCode
+            + 8 // gmtModified


这里加了gmtModified，但是反序列化的时候又没有使用？要确认下这块到底有没有用，如果有用要保证向下兼容，因为低版本的是没有这个字段的，在raft和file模式下会存在兼容问题
The gmtModified field is added here, but it is not used during deserialization. We need to confirm whether this field is actually needed. If it is, we must ensure backward compatibility, as older versions do not have this field. There may be compatibility issues in Raft and file modes.

I have deleted it.

funky-eyes · 2025-01-02T02:35:37Z

server/src/main/java/org/apache/seata/server/session/GlobalSession.java

@@ -724,6 +729,7 @@ public void decode(byte[] a) {

        this.beginTime = byteBuffer.getLong();
        this.status = GlobalStatus.get(byteBuffer.get());
+        this.gmtModified = byteBuffer.getLong();


需要向下兼容，不一定存在该值。
Backward compatibility is required, and the value does not necessarily exist.

I have deleted it.

funky-eyes · 2025-01-02T02:39:29Z

server/src/main/java/org/apache/seata/server/session/GlobalSession.java

@@ -787,11 +793,17 @@ public void asyncCommit() throws TransactionException {
    }

    public void queueToRetryCommit() throws TransactionException {
+        if (this.status == GlobalStatus.StopCommitOrCommitRetry || this.status == GlobalStatus.StopRollbackOrRollbackRetry) {


StopRollbackOrRollbackRetry这个状态应该不会走到这里
StopRollbackOrRollbackRetry this state shouldn't be here

I have deleted it.

funky-eyes · 2025-01-02T02:39:44Z

server/src/main/java/org/apache/seata/server/session/GlobalSession.java

        changeGlobalStatus(GlobalStatus.CommitRetrying);
    }

    public void queueToRetryRollback() throws TransactionException {
        GlobalStatus currentStatus = this.getStatus();
+        if (currentStatus == GlobalStatus.StopCommitOrCommitRetry || currentStatus == GlobalStatus.StopRollbackOrRollbackRetry) {


与上面相反
Contrary to the above

I have deleted it.

funky-eyes · 2025-01-02T02:50:48Z

tcc/src/main/java/org/apache/seata/rm/tcc/RMHandlerTCC.java

+        BranchDeleteResponse branchDeleteResponse = new BranchDeleteResponse();
+        try {
+            boolean result = DefaultCommonFenceHandler.get().
+                    deleteFenceByXidAndBranchId(request.getXid(), request.getBranchId());


我认为tcc的删除不能简单删除，因为如tcc一阶段是预留资源，如果被删除了，理论上应该走回滚逻辑，而deletefence本身有一个定时任务会去删除，故不需要专门的deleterequest，只要下发回滚即可，如果回滚失败应该提示删除失败，在提供一个强制删除的接口，针对回滚失败的事务，强删就是只删除服务端的session数据
I believe that the deletion in TCC (Try-Confirm-Cancel) should not be a simple removal. Since TCC’s first phase reserves resources, if it's deleted, it should theoretically trigger a rollback logic. The deletefence already has a scheduled task to handle the deletion, so there’s no need for a dedicated deleterequest. Instead, a rollback should be issued. If the rollback fails, the deletion failure should be reported. Additionally, a forced deletion interface should be provided for transactions where the rollback fails. In this case, the forced deletion would only remove the session data from the server.

已按照意见进行更改，并新添加了全局和分支事务的强制session删除功能
Changes have been made in accordance with the comments, and new features have been added to force session deletion for global and branch transaction

…e/console-trx

xjlgod added 8 commits November 16, 2024 20:36

feature: add console transaction control

afeb363

fix: add ts locales

d94180b

feat: add file license

d5c41d7

fix: fix session unit test

7a06864

fix: fix session unit test

d44cfb2

Merge remote-tracking branch 'origin/2.x' into feature/console-trx

6dedb60

Merge remote-tracking branch 'origin/2.x' into feature/console-trx

a33e24e

# Conflicts: # common/src/main/java/org/apache/seata/common/DefaultValues.java

feat: fix sessionConvert test

3d076f6

xjlgod added 3 commits December 6, 2024 23:47

Merge branch '2.x' into feature/console-trx

89aa1dd

Merge branch '2.x' into feature/console-trx

ce4b0d0

fix: fix RMHandlerSagaAnnotation compile

9af570e

xjlgod changed the title ~~[WIP] feature: add console transaction control~~ feature: add console transaction control Dec 11, 2024

xjlgod and others added 15 commits December 11, 2024 22:47

fix: fix GlobalStatus comment

ff7216e

fix: fix status in ts control

573419a

fix: fix unused import

9b64c07

Merge branch '2.x' into feature/console-trx

7f48246

fix: add relate comment

e74ca2a

Merge remote-tracking branch 'origin/feature/console-trx' into featur…

59ab61f

…e/console-trx

Merge remote-tracking branch 'upstream/2.x' into feature/console-trx

ee1cd74

# Conflicts: # server/src/test/java/org/apache/seata/server/session/FileSessionManagerTest.java

fix: FileSessionManagerTest conflict solve

77a7075

feat: del stop retry task

ac3d722

fix: del unused import

ec68aa6

Merge branch '2.x' into feature/console-trx

8c88802

fix: del gmt modify time in session

2b905ef

Merge remote-tracking branch 'origin/feature/console-trx' into featur…

e651120

…e/console-trx

fix: del gmt modify time in session

b193065

fix: del gmt modify time in session

74d1f67

jsbxyyx added this to the 2.4.0 milestone Dec 31, 2024

fix: fix global lock file service and redis service

ceed9ba

funky-eyes reviewed Jan 2, 2025

View reviewed changes

xjlgod added 14 commits January 3, 2025 11:13

fix: fix button display

3a47a2b

fix: del branchdel request and resp

786dcd4

fix: fix test build

254c958

fix: fix pmd check

3170302

fix: fix pmd check

534d4bb

fix: fix ci error

819fdb9

Merge branch '2.x' into feature/console-trx

3b52699

fix: fix ci error

2a2068a

fix: fix ci error

be53323

feat: add force delete session

dfe856e

fix: ci error fix

21231c5

Merge branch '2.x' into feature/console-trx

92669aa

fix: fix front display

0a5caf1

Merge remote-tracking branch 'origin/feature/console-trx' into featur…

ec3a0cf

…e/console-trx

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feature: add console transaction control #7024

feature: add console transaction control #7024

xjlgod commented Nov 22, 2024 •

edited

Loading

codecov bot commented Dec 1, 2024 •

edited

Loading

funky-eyes Jan 2, 2025

xjlgod Jan 8, 2025

funky-eyes Jan 2, 2025

xjlgod Jan 8, 2025

funky-eyes Jan 2, 2025

xjlgod Jan 8, 2025

funky-eyes Jan 2, 2025

xjlgod Jan 8, 2025

funky-eyes Jan 2, 2025

xjlgod Jan 8, 2025

funky-eyes Jan 2, 2025

xjlgod Jan 8, 2025

funky-eyes Jan 2, 2025

xjlgod Jan 8, 2025

funky-eyes Jan 2, 2025

xjlgod Jan 8, 2025

funky-eyes Jan 2, 2025

xjlgod Jan 8, 2025

funky-eyes Jan 2, 2025

xjlgod Jan 8, 2025

feature: add console transaction control #7024

Are you sure you want to change the base?

feature: add console transaction control #7024

Conversation

xjlgod commented Nov 22, 2024 • edited Loading

Ⅰ. Describe what this PR did

Ⅱ. Does this pull request fix one issue?

Ⅲ. Why don't you add test cases (unit test/integration test)?

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

codecov bot commented Dec 1, 2024 • edited Loading

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

xjlgod commented Nov 22, 2024 •

edited

Loading

codecov bot commented Dec 1, 2024 •

edited

Loading