Skip to content

Commit

Permalink
Merge branch '2.x' into clever_fix_tcc_deadlock_v2
Browse files Browse the repository at this point in the history
  • Loading branch information
iAmClever authored Jul 29, 2024
2 parents d56a07e + 20cd962 commit 8c229c1
Show file tree
Hide file tree
Showing 53 changed files with 178 additions and 3,584 deletions.
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,10 @@ Thumbs.db

#h2
*.db

/console/src/main/resources/static/css/
/console/src/main/resources/static/img/
/console/src/main/resources/static/js/
/console/src/main/resources/static/saga-statemachine-designer/
/console/src/main/resources/static/index.html
/console/src/main/resources/static/version.json
7 changes: 6 additions & 1 deletion changes/en-us/2.x.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ Add changes here for all PR submitted to the 2.x branch.
- [[#6668](https://github.com/apache/incubator-seata/pull/6668)] thread safety issue when adding and removing instances
- [[#6678](https://github.com/apache/incubator-seata/pull/6678)] fix the same record has different lowkeys due to mixed case of table names yesterday
- [[#6706](https://github.com/apache/incubator-seata/pull/6706)] add three tcc fence interceptors to fix tcc fence deadlock exception
- [[#6697](https://github.com/apache/incubator-seata/pull/6697)] v0 ByteBuf should not decode by super class


### optimize:
- [[#6499](https://github.com/apache/incubator-seata/pull/6499)] split the task thread pool for committing and rollbacking statuses
Expand All @@ -30,11 +32,13 @@ Add changes here for all PR submitted to the 2.x branch.
- [[#6666](https://github.com/apache/incubator-seata/pull/6666)] add ExceptionUtil class for unwarp error msg
- [[#6654](https://github.com/apache/incubator-seata/pull/6654)] add Namingserver package module
- [[#6667](https://github.com/apache/incubator-seata/pull/6667)] optimize Namingserver log output
- [[#6687](https://github.com/apache/incubator-seata/pull/6687)] delete static code built on the frontend
- [[#6700](https://github.com/apache/incubator-seata/pull/6700)] remove sdk version checking

### refactor:

### security:

- [[#6702](https://github.com/apache/incubator-seata/pull/6702)] fix REC security vulnerability during Raft deserialization

### test:
- [[#6608](https://github.com/apache/incubator-seata/pull/6608)] add unit test for sql-parser-core
Expand All @@ -60,5 +64,6 @@ Thanks to these contributors for their code commits. Please report an unintended
- [wuwen5](https://github.com/wuwen5)
- [iAmClever](https://github.com/iAmClever)
- [GoodBoyCoder](https://github.com/GoodBoyCoder)
- [liuqiufeng](https://github.com/liuqiufeng)

Also, we receive many valuable issues, questions and advices from our community. Thanks for you all.
5 changes: 5 additions & 0 deletions changes/zh-cn/2.x.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
- [[#6668](https://github.com/apache/incubator-seata/pull/6668)] 解决namingserver同一个集群下instance添加和删除时的线程安全问题
- [[#6678](https://github.com/apache/incubator-seata/pull/6678)] 修复由于表名大小写问题导致的相同记录生成不同RowKey的问题
- [[#6706](https://github.com/apache/incubator-seata/pull/6706)] 添加三个tcc fence拦截器来修复死锁异常
- [[#6697](https://github.com/apache/incubator-seata/pull/6697)] v0版本的ByteBuf不应由父类先解码

### optimize:
- [[#6499](https://github.com/apache/incubator-seata/pull/6499)] 拆分 committing 和 rollbacking 状态的任务线程池
Expand All @@ -30,11 +31,14 @@
- [[#6666](https://github.com/apache/incubator-seata/pull/6666)] 添加ExceptionUtil工具类用于解包装异常
- [[#6654](https://github.com/apache/incubator-seata/pull/6654)] 增加Namingserver打包功能
- [[#6667](https://github.com/apache/incubator-seata/pull/6667)] 优化Namingserver日志输出
- [[#6687](https://github.com/apache/incubator-seata/pull/6687)] 删除前端构建的静态代码
- [[#6700](https://github.com/apache/incubator-seata/pull/6700)] 去掉sdk版本检查

### refactor:


### security:
- [[#6702](https://github.com/apache/incubator-seata/pull/6702)] 修复Raft反序列化时存在RCE安全漏洞

### test:
- [[#6608](https://github.com/apache/incubator-seata/pull/6608)] 添加sql-parser-core模块测试用例
Expand All @@ -61,5 +65,6 @@
- [wuwen5](https://github.com/wuwen5)
- [iAmClever](https://github.com/iAmClever)
- [GoodBoyCoder](https://github.com/GoodBoyCoder)
- [liuqiufeng](https://github.com/liuqiufeng)

同时,我们收到了社区反馈的很多有价值的issue和建议,非常感谢大家。
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,16 @@ public enum ErrorCode {
/**
* 0001 ~ 0099 Configuration related errors
*/
ERR_CONFIG(ErrorType.Config, 0001);
ERR_CONFIG(ErrorType.Config, 0001),

/**
* The error code of the transaction exception.
* 0100 ~ 0199 Security related errors
*/
ERR_DESERIALIZATION_SECURITY(ErrorType.Security, 0156);

/**
* The error code of the transaction exception.
*/
private int code;
private ErrorType type;

Expand Down Expand Up @@ -77,6 +82,10 @@ enum ErrorType {
* Network error type.
*/
Network,
/**
* Security related error type.
*/
Security,
/**
* Tm error type.
*/
Expand Down
3 changes: 2 additions & 1 deletion common/src/main/resources/error/ErrorCode_en.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,5 @@
#
ERR_PREFIX=ERR-CODE: [Seata-{code}][{key}]
ERR_POSTFIX=More: [https://seata.apache.org/docs/next/overview/faq#{code}]
ERR_CONFIG=config error, {0}
ERR_CONFIG=config error, {0}
ERR_DESERIALIZATION_SECURITY=deserialization security error, {0}
137 changes: 66 additions & 71 deletions console/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -151,79 +151,74 @@
<version>${project.version}</version>
</dependency>
</dependencies>
<profiles>
<profile>
<id>release-frontend</id>
<build>
<plugins>
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>

<build>
<plugins>
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<configuration>
<workingDirectory>src/main/resources/static/console-fe</workingDirectory>
</configuration>
<executions>
<execution>
<id>install node and npm</id>
<goals>
<goal>install-node-and-npm</goal>
</goals>
<phase>generate-resources</phase>
<configuration>
<workingDirectory>src/main/resources/static/console-fe</workingDirectory>
<nodeVersion>v19.5.0</nodeVersion>
</configuration>
<executions>
<execution>
<id>install node and npm</id>
<goals>
<goal>install-node-and-npm</goal>
</goals>
<phase>generate-resources</phase>
<configuration>
<nodeVersion>v19.5.0</nodeVersion>
</configuration>
</execution>
<execution>
<id>npm install</id>
<goals>
<goal>npm</goal>
</goals>
<phase>generate-resources</phase>
<configuration>
<arguments>install</arguments>
</configuration>
</execution>
<execution>
<id>npm build</id>
<goals>
<goal>npm</goal>
</goals>
<phase>generate-resources</phase>
<configuration>
<arguments>run build</arguments>
<environmentVariables>
<VERSION>${project.version}</VERSION>
</environmentVariables>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>copy-resources-static</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>src/main/resources/static</outputDirectory>
<resources>
<resource>
<directory>src/main/resources/static/console-fe/dist</directory>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<build>
</execution>
<execution>
<id>npm install</id>
<goals>
<goal>npm</goal>
</goals>
<phase>generate-resources</phase>
<configuration>
<arguments>install</arguments>
<npmRegistryURL>https://registry.npmmirror.com/</npmRegistryURL>
</configuration>
</execution>
<execution>
<id>npm build</id>
<goals>
<goal>npm</goal>
</goals>
<phase>generate-resources</phase>
<configuration>
<arguments>run build</arguments>
<environmentVariables>
<VERSION>${project.version}</VERSION>
</environmentVariables>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>copy-resources-static</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>src/main/resources/static</outputDirectory>
<resources>
<resource>
<directory>src/main/resources/static/console-fe/dist</directory>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
<resources>
<resource>
<directory>src/main/resources</directory>
Expand Down
1 change: 0 additions & 1 deletion console/src/main/resources/static/css/bootstrap.css

This file was deleted.

1 change: 0 additions & 1 deletion console/src/main/resources/static/css/console1412.css

This file was deleted.

4 changes: 0 additions & 4 deletions console/src/main/resources/static/css/font-awesome.css

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
1 change: 0 additions & 1 deletion console/src/main/resources/static/css/icon.css

This file was deleted.

11 changes: 0 additions & 11 deletions console/src/main/resources/static/css/main.css

This file was deleted.

Binary file removed console/src/main/resources/static/img/black_dot.png
Binary file not shown.
Binary file removed console/src/main/resources/static/img/favicon.ico
Binary file not shown.
Binary file removed console/src/main/resources/static/img/seata.jpeg
Binary file not shown.
Binary file removed console/src/main/resources/static/img/seata_logo.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
1 change: 0 additions & 1 deletion console/src/main/resources/static/index.html

This file was deleted.

389 changes: 0 additions & 389 deletions console/src/main/resources/static/js/main.js

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit 8c229c1

Please sign in to comment.