Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
0c4e206
cherry pick
wangliang181230 Nov 27, 2023
0a79354
modify 2.x.md
wangliang181230 Nov 27, 2023
c1a2f82
add `test-os.yml`
wangliang181230 Nov 27, 2023
fb8b717
modify 2.x.md
wangliang181230 Nov 27, 2023
64386ab
Update 2.x.md
wangliang181230 Nov 27, 2023
976a70f
upgrade bytebuddy to `1.14.10`
wangliang181230 Nov 27, 2023
8036e0e
Enable the experimental of 'net.byte-buddy:byte-buddy'
wangliang181230 Nov 27, 2023
605b54d
Enable the experimental of 'net.byte-buddy:byte-buddy'
wangliang181230 Nov 27, 2023
b5f4481
revert and Fixed version number of 'byte-buddy'
wangliang181230 Nov 27, 2023
e181b66
fix dependency
wangliang181230 Nov 27, 2023
813dda0
add test for alpine-linux
wangliang181230 Nov 27, 2023
9a9e984
pull alpine:latest
wangliang181230 Nov 27, 2023
f247af5
fix
wangliang181230 Nov 27, 2023
f08a439
print
wangliang181230 Nov 27, 2023
8b8710d
Merge branch '2.x' into test-os-2.x
funky-eyes Nov 27, 2023
62a77d0
remove test-alpine-linux
wangliang181230 Nov 27, 2023
494df2c
optimize
wangliang181230 Nov 27, 2023
84692b3
optimize log
wangliang181230 Nov 28, 2023
208cd29
Revert "optimize log"
wangliang181230 Nov 28, 2023
093c8cb
optimize log
wangliang181230 Nov 28, 2023
05a8770
Merge remote-tracking branch 'upstream/2.x' into test-os-2.x
wangliang181230 Nov 28, 2023
b37e94f
optimize Version.isAboveOrEqualVersion150
wangliang181230 Nov 28, 2023
5426f69
Merge remote-tracking branch 'upstream/2.x' into test-os-2.x
wangliang181230 Nov 29, 2023
c281d6b
optimize ci script
wangliang181230 Nov 29, 2023
1fd741a
fix ci script
wangliang181230 Nov 29, 2023
ef61c29
revert
wangliang181230 Nov 30, 2023
af82725
Merge remote-tracking branch 'upstream/2.x' into test-os-2.x
wangliang181230 Nov 30, 2023
1158a37
optimize log and unit-test
wangliang181230 Dec 1, 2023
cc2ed4b
optimize unit-test
wangliang181230 Dec 1, 2023
51d49e2
upgrade kotlin-maven-plugin to 1.9.21
wangliang181230 Dec 1, 2023
e2cfcdc
remove kotlin-maven-plugin.version from test.yml
wangliang181230 Dec 1, 2023
9a1ae70
Merge branch '2.x' into test-os-2.x
wangliang181230 Dec 1, 2023
810fe98
fix unit-test for redis
wangliang181230 Dec 1, 2023
d981c53
enable test on windows-latest os
wangliang181230 Dec 1, 2023
9313f27
optimize test-os.yml
wangliang181230 Dec 1, 2023
d27416e
optimize
wangliang181230 Dec 1, 2023
4f5e6e2
fix ci for windows-latest
wangliang181230 Dec 1, 2023
5fb53f0
revert
wangliang181230 Dec 3, 2023
757a801
添加springboot3.2.0的CI
wangliang181230 Dec 5, 2023
c81d4f0
小调整。
wangliang181230 Dec 5, 2023
5335636
小调整。
wangliang181230 Dec 5, 2023
6c48c13
步骤名中,拼接java、druid等的版本号。
wangliang181230 Dec 5, 2023
e64e180
Merge branch '2.x' into test-os-2.x
xingfudeshi Dec 6, 2023
6bd7637
Merge branch '2.x' into test-os-2.x
wangliang181230 Dec 6, 2023
04c2c18
optimize build.yml
wangliang181230 Dec 6, 2023
851bd02
modify `install` to `test`
wangliang181230 Dec 7, 2023
0c49363
merge `test.yml` and `test-os.yml`
wangliang181230 Dec 7, 2023
ca55ac3
test springboot3.x in macos and windows
wangliang181230 Dec 7, 2023
5467164
尝试修复test.yml在windows-latest中执行失败的问题。
wangliang181230 Dec 8, 2023
d913c39
Revert "尝试修复test.yml在windows-latest中执行失败的问题。"
wangliang181230 Dec 8, 2023
dacc717
尝试修复test.yml在windows-latest中执行失败的问题。
wangliang181230 Dec 8, 2023
6d84e29
尝试修复test.yml在windows-latest中执行失败的问题。
wangliang181230 Dec 8, 2023
11a3e65
Revert "尝试修复test.yml在windows-latest中执行失败的问题。"
wangliang181230 Dec 8, 2023
f02bdf2
try fix test.yml in windows-latest
wangliang181230 Dec 8, 2023
ce10158
try fix
wangliang181230 Dec 8, 2023
155bf70
try fix
wangliang181230 Dec 8, 2023
e0459f5
try fix
wangliang181230 Dec 8, 2023
99ab3e8
Adjusting the order of os and springboot
wangliang181230 Dec 8, 2023
913e522
fix test.yml
wangliang181230 Dec 8, 2023
bc12d52
并行执行test.yml
wangliang181230 Dec 8, 2023
9a1b17c
Merge branch '2.x' into test-os-2.x
slievrly Dec 9, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 21 additions & 10 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,20 +28,27 @@ jobs:
# step 3
- name: "Print maven version"
run: ./mvnw -version
# step 4
- name: "Build with Maven"
# step 4.1
- name: "Test, Check style, Check license with Maven and Java8"
if: matrix.java == '8'
run: |
./mvnw -T 4C clean test \
-Dcheckstyle.skip=false -Dlicense.skip=false \
-Dmaven.git-commit-id.skip=true \
-e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
# step 4.2
- name: "Test with Maven and Java${{ matrix.java }}"
if: matrix.java != '8'
run: |
if [ "${{ matrix.java }}" == "8" ]; then
./mvnw -T 4C clean test -Dcheckstyle.skip=false -Dlicense.skip=false -Dmaven.git-commit-id.skip=true -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
elif [ "${{ matrix.java }}" == "17" ]; then
./mvnw -T 4C clean test -Dcheckstyle.skip=true -Dlicense.skip=true -Dmaven.git-commit-id.skip=true -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
fi
./mvnw -T 4C clean test \
-Dmaven.git-commit-id.skip=true \
-e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
# step 5
- name: "Codecov"
if: matrix.java == '8'
uses: codecov/[email protected]

# job 2: Test on 'arm64v8/ubuntu' OS.
# job 2: Build on 'arm64v8/ubuntu' OS (Skip tests).
build_arm64-binary:
runs-on: ubuntu-latest
if: ${{ github.event_name == 'push' && (github.ref_name == 'develop' || github.ref_name == 'snapshot' || github.ref_name == '2.x') }}
Expand All @@ -56,11 +63,15 @@ jobs:
id: qemu
uses: docker/setup-qemu-action@v3
# step 3
- name: "Build arm-binary"
- name: "Build with Maven on 'arm64v8/ubuntu:20.04' OS (Skip tests)"
run: |
docker run --rm -v ${{ github.workspace }}:/ws:rw --workdir=/ws \
arm64v8/ubuntu:20.04 \
bash -exc 'apt-get update -y && \
apt-get install maven -y && \
mvn -version && \
mvn -Prelease-seata -DskipTests -Dmaven.git-commit-id.skip=true clean install -U'
mvn clean install \
-Prelease-seata \
-DskipTests \
-Dmaven.git-commit-id.skip=true \
-e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
15 changes: 7 additions & 8 deletions .github/workflows/test-druid.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ jobs:
strategy:
fail-fast: false
matrix:
java: [ 8, 11, 17, 21 ]
druid: [
1.2.20,
1.2.19,
#1.2.18, # Unit test triggered a bug in Druid, see the commit https://github.com/alibaba/druid/commit/6c493f852852fb287ed5fd31ee16c27ead0ea5cf
#1.2.17, # Unit test triggered a bug in Druid, see the commit https://github.com/alibaba/druid/commit/6c493f852852fb287ed5fd31ee16c27ead0ea5cf
Expand Down Expand Up @@ -50,15 +50,14 @@ jobs:
uses: actions/[email protected]
with:
distribution: 'zulu'
java-version: ${{ matrix.java }}
java-version: 8
# step 3
- name: "Print maven version"
run: ./mvnw -version
# step 4
- name: "Test with Maven"
- name: "Test with Maven and Druid ${{ matrix.druid }}"
run: |
if [ "${{ matrix.java }}" == "8" ]; then
./mvnw -T 4C clean test -Ddruid.version=${{ matrix.druid }} -Dcheckstyle.skip=false -Dlicense.skip=false -Dmaven.git-commit-id.skip=true -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
else
./mvnw -T 4C clean test -Ddruid.version=${{ matrix.druid }} -Dcheckstyle.skip=true -Dlicense.skip=true -Dmaven.git-commit-id.skip=true -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
fi
./mvnw -T 4C clean test \
-Ddruid.version=${{ matrix.druid }} \
-Dmaven.git-commit-id.skip=true \
-e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
117 changes: 66 additions & 51 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,26 +8,25 @@ jobs:
# job 1
test:
name: "test"
runs-on: ubuntu-latest
runs-on: "${{ matrix.os }}-latest"
strategy:
fail-fast: false
matrix:
java: [ 8, 11, 17, 21 ]
os: [
ubuntu,
macos,
windows, # Skip tests, because too many errors in unit-test.
]
springboot: [
2.7.16 -Dspring-framework.version=5.3.30,
2.6.15 -Dspring-framework.version=5.3.27,
2.5.15 -Dspring-framework.version=5.3.27,
2.4.13 -Dspring-framework.version=5.3.13,
2.3.12.RELEASE -Dspring-framework.version=5.2.15.RELEASE,
2.2.13.RELEASE -Dspring-framework.version=5.2.12.RELEASE,
2.7.18 -D spring-framework.version=5.3.31,
2.6.15 -D spring-framework.version=5.3.27,
2.5.15 -D spring-framework.version=5.3.27,
2.4.13 -D spring-framework.version=5.3.13,
2.3.12.RELEASE -D spring-framework.version=5.2.15.RELEASE,
2.2.13.RELEASE -D spring-framework.version=5.2.12.RELEASE,
#2.1.18.RELEASE,
#2.0.9.RELEASE,
#1.5.22.RELEASE,
#1.4.7.RELEASE,
#1.3.8.RELEASE,
#1.2.8.RELEASE,
#1.1.12.RELEASE,
#1.0.2.RELEASE
]
steps:
# step 1
Expand All @@ -40,29 +39,40 @@ jobs:
distribution: 'zulu'
java-version: ${{ matrix.java }}
# step 3
- name: "Print maven version"
run: ./mvnw -version
# step 4
- name: "Test with Maven"
# https://docs.github.com/cn/free-pro-team@latest/actions/reference/context-and-expression-syntax-for-github-actions#github-context
## step 3.1: for Ubuntu and MacOS
- name: "Test with Maven on '${{ matrix.os }}' OS"
if: matrix.os != 'windows'
run: |
if [ "${{ matrix.java }}" == "8" ]; then
./mvnw -T 4C clean test -P args-for-client-test -Dspring-boot.version=${{ matrix.springboot }} -Dcheckstyle.skip=false -Dlicense.skip=false -Dmaven.git-commit-id.skip=true -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
else
./mvnw -T 4C clean test -P args-for-client-test -Dspring-boot.version=${{ matrix.springboot }} -Dcheckstyle.skip=true -Dlicense.skip=true -Dmaven.git-commit-id.skip=true -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
fi
./mvnw -version;
./mvnw -T 4C clean test \
-P args-for-client-test \
-Dspring-boot.version=${{ matrix.springboot }} \
-Dmaven.git-commit-id.skip=true \
-e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
## step 3.2: for Windows
- name: "Build with Maven on 'windows' OS (Skip tests)"
if: matrix.os == 'windows'
run: | # Skip tests, because too many errors in unit-test.
./mvnw.cmd -version;
./mvnw.cmd clean install -P args-for-client-test -DskipTests -D spring-boot.version=${{ matrix.springboot }} -D maven.git-commit-id.skip=true -e -B -D org.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;

# job 2
test-springboot3x:
name: "test-springboot3.x"
runs-on: ubuntu-latest
runs-on: "${{ matrix.os }}-latest"
strategy:
fail-fast: false
matrix:
java: [ 17, 21 ]
os: [
ubuntu,
macos,
windows, # Skip tests, because too many errors in unit-test.
]
springboot: [
3.1.4 -Dspring-framework.version=6.0.12,
3.0.11 -Dspring-framework.version=6.0.12,
3.2.0 -D spring-framework.version=6.1.1,
3.1.6 -D spring-framework.version=6.0.14,
3.0.13 -D spring-framework.version=6.0.14,
]
steps:
# step 1
Expand All @@ -75,34 +85,39 @@ jobs:
distribution: 'zulu'
java-version: ${{ matrix.java }}
# step 3
- name: "Print maven version"
run: ./mvnw -version
# step 4
- name: "Test with Maven"
## step 3.1: for Ubuntu and MacOS
- name: "Test with Maven on '${{ matrix.os }}' OS"
if: matrix.os != 'windows'
run: |
./mvnw -T 4C clean test -P args-for-client-test -Dspring-boot.version=${{ matrix.springboot }} -Dkotlin-maven-plugin.version=1.7.22 -Dcheckstyle.skip=true -Dlicense.skip=true -Dmaven.git-commit-id.skip=true -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
./mvnw -version;
./mvnw -T 4C clean install \
-P args-for-client-test \
-Dspring-boot.version=${{ matrix.springboot }} \
-Dmaven.git-commit-id.skip=true \
-e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
## step 3.2: for Windows
- name: "Build with Maven on 'windows' OS (Skip tests)"
if: matrix.os == 'windows'
run: | # Skip tests, because too many errors in unit-test.
./mvnw.cmd -version;
./mvnw.cmd clean install -P args-for-client-test -DskipTests -D spring-boot.version=${{ matrix.springboot }} -D maven.git-commit-id.skip=true -e -B -D org.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;

# job 3
arm64-test:
test-arm64:
name: "test-arm64"
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
springboot: [
2.7.16 -Dspring-framework.version=5.3.30,
2.6.15 -Dspring-framework.version=5.3.27,
2.5.15 -Dspring-framework.version=5.3.27,
#2.7.18 -Dspring-framework.version=5.3.31, # The maven-compiler-plugin will throw an error for an unknown reason.
#2.6.15 -Dspring-framework.version=5.3.27, # The maven-compiler-plugin will throw an error for an unknown reason.
#2.5.15 -Dspring-framework.version=5.3.27, # The maven-compiler-plugin will throw an error for an unknown reason.
2.4.13 -Dspring-framework.version=5.3.13,
2.3.12.RELEASE -Dspring-framework.version=5.2.15.RELEASE,
2.2.13.RELEASE -Dspring-framework.version=5.2.12.RELEASE,
#2.1.18.RELEASE,
#2.0.9.RELEASE,
#1.5.22.RELEASE,
#1.4.7.RELEASE,
#1.3.8.RELEASE,
#1.2.8.RELEASE,
#1.1.12.RELEASE,
#1.0.2.RELEASE
]
steps:
# step 1
Expand All @@ -111,18 +126,18 @@ jobs:
# step 2
- name: "Set up QEMU"
id: qemu
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v3
# step 3
- name: "install"
- name: "Build with Maven on 'arm64v8/ubuntu:20.04' OS (Skip tests)"
run: |
docker run --rm -v ${{ github.workspace }}:/ws:rw --workdir=/ws \
arm64v8/ubuntu:20.04 \
bash -exc 'apt-get update -y && \
apt-get install maven -y'
# step 4
- name: "Print maven version"
run: ./mvnw -version
# step 5
- name: "test-arm64"
run: |
./mvnw -T 4C clean test -P args-for-client-test -Dspring-boot.version=${{ matrix.springboot }} -Dcheckstyle.skip=true -Dlicense.skip=true -Dmaven.git-commit-id.skip=true -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
apt-get install maven -y && \
mvn -version && \
mvn -T 4C clean install \
-Dspring-boot.version=${{ matrix.springboot }} \
-Prelease-seata \
-DskipTests \
-Dmaven.git-commit-id.skip=true \
-e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
4 changes: 3 additions & 1 deletion build/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
<!-- Compiler -->
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
<protobuf-maven-plugin.version>0.6.1</protobuf-maven-plugin.version>
<kotlin-maven-plugin.version>1.3.72</kotlin-maven-plugin.version>
<kotlin-maven-plugin.version>1.9.21</kotlin-maven-plugin.version>
<!-- Check -->
<maven-pmd-plugin.version>3.8</maven-pmd-plugin.version>
<p3c-pmd.version>1.3.6</p3c-pmd.version>
Expand Down Expand Up @@ -431,6 +431,8 @@

--add-opens java.sql/java.sql=ALL-UNNAMED
--add-opens java.sql.rowset/javax.sql.rowset.serial=ALL-UNNAMED

-Dnet.bytebuddy.experimental=true
</maven.surefire.argLine>
</properties>
</profile>
Expand Down
1 change: 1 addition & 0 deletions changes/en-us/2.x.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ Add changes here for all PR submitted to the 2.x branch.
- [[#6069](https://github.com/seata/seata/pull/6069)] Upgrade Guava dependencies to fix security vulnerabilities

### test:
- [[#6081](https://github.com/seata/seata/pull/6081)] add `test-os.yml` for testing the OS
- [[#PR_NO](https://github.com/seata/seata/pull/PR_NO)] A brief and accurate description of PR
- [[#6125](https://github.com/seata/seata/pull/6125)] unbind xid in TransactionTemplateTest

Expand Down
2 changes: 1 addition & 1 deletion changes/zh-cn/2.x.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
- [[#6069](https://github.com/seata/seata/pull/6069)] 升级Guava依赖版本,修复安全漏洞

### test:
- [[#PR_NO](https://github.com/seata/seata/pull/PR_NO)] 准确简要的PR描述
- [[#6081](https://github.com/seata/seata/pull/6081)] 添加 `test-os.yml` 用于测试seata在各种操作系统下的运行情况
- [[#6125](https://github.com/seata/seata/pull/6125)] TransactionTemplateTest单测unbind xid

非常感谢以下 contributors 的代码贡献。若有无意遗漏,请报告。
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ protected String loadBalance(String transactionServiceGroup, Object msg) {
RegistryFactory.getInstance().aliveLookup(transactionServiceGroup);
address = this.doSelect(inetSocketAddressList, msg);
} catch (Exception ex) {
LOGGER.error(ex.getMessage());
LOGGER.error("Select the address failed: {}", ex.getMessage());
}
if (address == null) {
throw new FrameworkException(NoAvailableService);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,17 +103,54 @@ private static String[] getDenyClassPatternList() {
}

private static Set<Class<?>> getProtocolType() {
Enumeration<URL> packageDir = null;
String packageName = "io.seata.core.protocol";
Set<Class<?>> classNameSet = new HashSet<>();

try {
packageDir = Thread.currentThread().getContextClassLoader().getResources(packageName.replace(".", "/"));
String packageName = "io.seata.core.protocol";
Enumeration<URL> packageDir = Thread.currentThread().getContextClassLoader().getResources(packageName.replace(".", "/"));
while (packageDir.hasMoreElements()) {
String filePath = packageDir.nextElement().getFile();
findProtocolClassByPackage(filePath, packageName, classNameSet);
}
} catch (IOException ignore) {
}
while (packageDir.hasMoreElements()) {
String filePath = packageDir.nextElement().getFile();
findProtocolClassByPackage(filePath, packageName, classNameSet);

if (classNameSet.size() < 30) {
// package io.seata.core.protocol
classNameSet.add(io.seata.core.protocol.BatchResultMessage.class);
classNameSet.add(io.seata.core.protocol.HeartbeatMessage.class);
classNameSet.add(io.seata.core.protocol.MergedWarpMessage.class);
classNameSet.add(io.seata.core.protocol.MergeResultMessage.class);
classNameSet.add(io.seata.core.protocol.RegisterRMRequest.class);
classNameSet.add(io.seata.core.protocol.RegisterRMResponse.class);
classNameSet.add(io.seata.core.protocol.RegisterTMRequest.class);
classNameSet.add(io.seata.core.protocol.RegisterTMResponse.class);
classNameSet.add(io.seata.core.protocol.RpcMessage.class);

// package io.seata.core.protocol.transaction
classNameSet.add(io.seata.core.protocol.transaction.BranchCommitRequest.class);
classNameSet.add(io.seata.core.protocol.transaction.BranchCommitResponse.class);
classNameSet.add(io.seata.core.protocol.transaction.BranchRegisterRequest.class);
classNameSet.add(io.seata.core.protocol.transaction.BranchRegisterResponse.class);
classNameSet.add(io.seata.core.protocol.transaction.BranchReportRequest.class);
classNameSet.add(io.seata.core.protocol.transaction.BranchReportResponse.class);
classNameSet.add(io.seata.core.protocol.transaction.BranchRollbackRequest.class);
classNameSet.add(io.seata.core.protocol.transaction.BranchRollbackResponse.class);
classNameSet.add(io.seata.core.protocol.transaction.GlobalBeginRequest.class);
classNameSet.add(io.seata.core.protocol.transaction.GlobalBeginResponse.class);
classNameSet.add(io.seata.core.protocol.transaction.GlobalCommitRequest.class);
classNameSet.add(io.seata.core.protocol.transaction.GlobalCommitResponse.class);
classNameSet.add(io.seata.core.protocol.transaction.GlobalLockQueryResponse.class);
classNameSet.add(io.seata.core.protocol.transaction.GlobalLockQueryRequest.class);
classNameSet.add(io.seata.core.protocol.transaction.GlobalReportRequest.class);
classNameSet.add(io.seata.core.protocol.transaction.GlobalReportResponse.class);
classNameSet.add(io.seata.core.protocol.transaction.GlobalRollbackRequest.class);
classNameSet.add(io.seata.core.protocol.transaction.GlobalRollbackResponse.class);
classNameSet.add(io.seata.core.protocol.transaction.GlobalStatusRequest.class);
classNameSet.add(io.seata.core.protocol.transaction.GlobalStatusResponse.class);
classNameSet.add(io.seata.core.protocol.transaction.UndoLogDeleteRequest.class);
}

return classNameSet;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public List<InetSocketAddress> lookup(String key) throws Exception {
for (String endpoint : endpoints) {
String[] ipAndPort = NetUtil.splitIPPortStr(endpoint);
if (ipAndPort.length != 2) {
throw new IllegalArgumentException("endpoint format should like ip:port");
throw new IllegalArgumentException("endpoint format should like ip:port, the invalid endpoint: " + endpoint);
}
inetSocketAddresses.add(new InetSocketAddress(ipAndPort[0], Integer.parseInt(ipAndPort[1])));
}
Expand Down
Loading