Skip to content

optimize: use curator instead of zkclient in registry model #6831

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 32 commits into from
Sep 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
60d6ec4
feat: use curator instead of zkclient in config model
leizhiyuan Aug 24, 2024
e5af87b
Merge branch '2.x' into feat/curator_config_zk
leizhiyuan Aug 25, 2024
58dfd88
chore: add mvn dep pom
leizhiyuan Aug 26, 2024
97123d9
Merge remote-tracking branch 'bystander/feat/curator_config_zk' into …
leizhiyuan Aug 26, 2024
697276c
Merge branch '2.x' into feat/curator_config_zk
leizhiyuan Aug 26, 2024
a10fd3f
chore: add mvn dep pom
leizhiyuan Aug 26, 2024
cd0d4e1
Merge remote-tracking branch 'bystander/feat/curator_config_zk' into …
leizhiyuan Aug 26, 2024
5459cfa
Merge branch '2.x' into feat/curator_config_zk
leizhiyuan Aug 26, 2024
b9a4545
Merge branch '2.x' into feat/curator_config_zk
funky-eyes Aug 26, 2024
1ae2dc3
Merge branch '2.x' into feat/curator_config_zk
funky-eyes Aug 27, 2024
4d7bf95
Merge branch '2.x' into feat/curator_config_zk
funky-eyes Aug 27, 2024
0f29f88
Merge branch '2.x' into feat/curator_config_zk
leizhiyuan Aug 29, 2024
c4c3168
chore: add mvn dep pom
leizhiyuan Aug 29, 2024
6b6d6ef
Merge branch '2.x' into feat/curator_config_zk
slievrly Aug 31, 2024
322d6c3
Merge branch '2.x' into feat/curator_config_zk
funky-eyes Sep 2, 2024
9283b44
Merge branch '2.x' into feat/curator_config_zk
leizhiyuan Sep 2, 2024
50b0a03
chore: add mvn dep pom
leizhiyuan Sep 2, 2024
eeae604
feat: use curator instead of zkclient in discovery
leizhiyuan Sep 8, 2024
ff79df3
Merge branch '2.x' into feat/curator_discovery_zk
leizhiyuan Sep 8, 2024
94d93f7
Merge branch '2.x' into feat/curator_discovery_zk
funky-eyes Sep 10, 2024
2dea460
Merge branch '2.x' into feat/curator_discovery_zk
funky-eyes Sep 11, 2024
2537227
Merge branch '2.x' into feat/curator_discovery_zk
xingfudeshi Sep 11, 2024
f143039
Merge branch '2.x' into feat/curator_discovery_zk
xingfudeshi Sep 11, 2024
d002363
doc: add doc
leizhiyuan Sep 11, 2024
28756ce
doc: add doc
leizhiyuan Sep 11, 2024
e193c36
test: try to fix test case
leizhiyuan Sep 11, 2024
a52da31
test: try to fix test case
leizhiyuan Sep 11, 2024
7056d5d
doc: add doc
leizhiyuan Sep 11, 2024
86f7073
Merge branch '2.x' into feat/curator_discovery_zk
funky-eyes Sep 12, 2024
43f4565
Merge branch '2.x' into feat/curator_discovery_zk
funky-eyes Sep 12, 2024
5c0a61e
Update discovery/seata-discovery-zk/src/main/java/org/apache/seata/di…
funky-eyes Sep 12, 2024
23329bd
Update discovery/seata-discovery-zk/src/main/java/org/apache/seata/di…
funky-eyes Sep 12, 2024
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
1 change: 1 addition & 0 deletions changes/en-us/2.x.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ Add changes here for all PR submitted to the 2.x branch.
- [[#6827](https://github.com/apache/incubator-seata/pull/6827)] rename namingserver registry type
- [[#6836](https://github.com/apache/incubator-seata/pull/6836)] add independent nacos for the CI process
- [[#6779](https://github.com/apache/incubator-seata/pull/6779)] use curator instead of zkclient in config model
- [[#6831](https://github.com/apache/incubator-seata/pull/6831)] use curator instead of zkclient in registry model


### refactor:
Expand Down
2 changes: 2 additions & 0 deletions changes/zh-cn/2.x.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@
- [[#6827](https://github.com/apache/incubator-seata/pull/6827)] 重命名namingserver注册类型改为seata
- [[#6836](https://github.com/apache/incubator-seata/pull/6836)] 为CI流程增加独立nacos
- [[#6779](https://github.com/apache/incubator-seata/pull/6779)] 在config模块中使用curator替代zkclient
- [[#6831](https://github.com/apache/incubator-seata/pull/6831)] 在registry模块中使用curator替代zkclient


### refactor:

Expand Down
14 changes: 6 additions & 8 deletions discovery/seata-discovery-zk/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,12 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.101tec</groupId>
<artifactId>zkclient</artifactId>
<exclusions>
<exclusion>
<artifactId>log4j</artifactId>
<groupId>log4j</groupId>
</exclusion>
</exclusions>
<groupId>org.apache.curator</groupId>
<artifactId>curator-recipes</artifactId>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
Expand Down
Loading
Loading