-
Notifications
You must be signed in to change notification settings - Fork 8.8k
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
bugfix: hikari datasource auto proxy fail #5134
Conversation
Codecov Report
@@ Coverage Diff @@
## develop #5134 +/- ##
=============================================
- Coverage 49.35% 48.95% -0.40%
- Complexity 4145 4166 +21
=============================================
Files 737 741 +4
Lines 26190 26521 +331
Branches 3232 3294 +62
=============================================
+ Hits 12925 12984 +59
- Misses 11881 12129 +248
- Partials 1384 1408 +24
|
...ng-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/SeataAutoConfiguration.java
Outdated
Show resolved
Hide resolved
...arter/src/main/java/io/seata/spring/boot/autoconfigure/SeataDataSourceAutoConfiguration.java
Outdated
Show resolved
Hide resolved
...arter/src/main/java/io/seata/spring/boot/autoconfigure/SeataDataSourceAutoConfiguration.java
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
…o 1114_for_5073 * '1114_for_5073' of https://github.com/zw201913/seata: bugfix: hikari datasource auto proxy fail (apache#5134) bugfix: rollback active xa connection fail (apache#5131) optimize: support oracle on delete tccfence logs (apache#5124) feature: support passing `contextPath` parameter to Nacos client (apache#5111) bugfix:NPE caused when there is no @GlobalTransactional annotation on the RM side (apache#5109) bugfix: Druid disable oracle implicit cache (apache#5098) bugfix: fix access key loss after server restart (apache#5097) optimize: remove druid dependency in ConnectionProxy (apache#5104) bugfix:fix ClassNotFoundException during the ZK unit test (apache#5101) bugfix: fix when seata and jpa are used together, their AutoConfiguration order is incorrect (apache#5092) optimize: lock priority attempts to insert (apache#4681) bugfix: update join condition placeholder param error (apache#5052)
Ⅰ. Describe what this PR did
springboot的DataSourceAutoConfiguration优先级非常低,而seata SeataDataSourceAutoConfiguration 需要等到datasourcebean存在后再去代理,导致了优先级一定会高于DataSourceAutoConfiguration,DataSourceAutoConfiguration中有hikari的自动datasource装载,导致hikari的bean先加载后,Seata的SeataAutoDataSourceProxyCreator并没有进行构建,导致了二阶段如果rm重启了进行下发是找不到对应的rmchannel的.
1.5.2
1.6.0-SNAPSHOT 此pr的效果
对其他datasource无影响,如druid
Ⅱ. Does this pull request fix one issue?
fixes #4970
fixes #4976
Ⅲ. Why don't you add test cases (unit test/integration test)?
Ⅳ. Describe how to verify it
Ⅴ. Special notes for reviews