Skip to content
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:rm channel register null resource #1401

Merged
merged 8 commits into from Oct 13, 2019
Merged

bugfix:rm channel register null resource #1401

merged 8 commits into from Oct 13, 2019

Conversation

slievrly
Copy link
Member

@slievrly slievrly commented Aug 5, 2019

Signed-off-by: slievrly slievrly@163.com

Ⅰ. Describe what this PR did

bugfix:rm channel register null resource

Ⅱ. Does this pull request fix one issue?

ref #1359

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

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

Signed-off-by: slievrly <slievrly@163.com>
Signed-off-by: slievrly <slievrly@163.com>
@codecov-io
Copy link

codecov-io commented Aug 5, 2019

Codecov Report

Merging #1401 into develop will increase coverage by 0.01%.
The diff coverage is 12.5%.

Impacted file tree graph

@@              Coverage Diff              @@
##             develop    #1401      +/-   ##
=============================================
+ Coverage      50.05%   50.06%   +0.01%     
  Complexity      2130     2130              
=============================================
  Files            411      412       +1     
  Lines          14209    14218       +9     
  Branches        1715     1715              
=============================================
+ Hits            7112     7118       +6     
- Misses          6407     6411       +4     
+ Partials         690      689       -1
Impacted Files Coverage Δ Complexity Δ
...main/java/io/seata/core/model/ResourceManager.java 0% <0%> (ø) 0 <0> (?)
.../main/java/io/seata/rm/tcc/TCCResourceManager.java 0% <0%> (ø) 0 <0> (ø) ⬇️
...java/io/seata/rm/datasource/DataSourceManager.java 30.76% <100%> (+3.34%) 7 <0> (ø) ⬇️
...main/java/io/seata/core/rpc/netty/RmRpcClient.java 28.71% <4%> (-0.59%) 10 <0> (ø)
...server/store/file/FileTransactionStoreManager.java 53.61% <0%> (+0.98%) 27% <0%> (ø) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 60a3e5c...90aa1d4. Read the comment docs.

@zjinlei
Copy link
Contributor

zjinlei commented Aug 27, 2019

please resolve conflicts

@xingfudeshi xingfudeshi self-requested a review September 7, 2019 12:31
Signed-off-by: slievrly <slievrly@163.com>
Signed-off-by: slievrly <slievrly@163.com>

# Conflicts:
#	core/src/main/java/io/seata/core/rpc/netty/RmRpcClient.java
#	rm-datasource/src/main/java/io/seata/rm/datasource/DataSourceManager.java
Signed-off-by: slievrly <slievrly@163.com>
Copy link
Member

@xingfudeshi xingfudeshi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

Copy link
Contributor

@zjinlei zjinlei left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@zjinlei zjinlei merged commit 1cff044 into apache:develop Oct 13, 2019
dangquocbang pushed a commit to dangquocbang/seata that referenced this pull request Oct 14, 2019
* 'develop' of https://github.com/seata/seata:
  test: enhance test coverage of seata common (apache#1755)
  security: upgrade jackson to avoid security vulnerabilities (apache#1756)
  bugfix:rm channel register null resource (apache#1401)
  bugfix:fix memory lock is not released due to hash conflict (apache#1751)
  optimize:use raw types instead of boxing types (apache#1747)
  change get charset (apache#1707)
  fix undo support oracle table meta cache (apache#1749)
  bugfix: fix use 'in' and 'between' in where condition for Oracle and Mysql (apache#1699)
  optimize:add some server's jvm parameters (apache#1738)
  Saga implementation base on state machine (apache#1608)
  optimize:inner class may be static (apache#1706)
  feature: retry when tm commit or rollback failed (apache#1739)
  optimize: abstract common undolog manager method (apache#1712)
  bugfix: when tm commit or rollback failed,xid need to be clean (apache#1735)
  optimize: eliminate the possibility of allocating too much direct memory (apache#1657)
  Based on Java 5 optimization (apache#1705)
  bugfix: oracle batch insert error (apache#1729)

# Conflicts:
#	pom.xml
@dreamoftch
Copy link

hi @slievrly , this commit leads to the springboot-tcc-sample keeps blocking when run the SpringbootTccTransactionApplication which acts as TM

i found the reason leads to blocking is that SpringbootTccTransactionApplication which acts as TM does not have RM inside, but ActionInterceptorHandler invokes the branchRegister method, which finally requires RM resources, thus code goes into ResourceManager.RESOURCE_LOCK.wait().

should i modify the springboot-tcc-sample somewhere to adapt this ?

thanks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants