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:fix memory lock is not released due to hash conflict #1751

Merged
merged 2 commits into from
Oct 12, 2019
Merged

bugfix:fix memory lock is not released due to hash conflict #1751

merged 2 commits into from
Oct 12, 2019

Conversation

BeiKeJieDeLiuLangMao
Copy link
Contributor

@BeiKeJieDeLiuLangMao BeiKeJieDeLiuLangMao commented Oct 12, 2019

Ⅰ. Describe what this PR did

fix memory lock is not released

Ⅱ. Does this pull request fix one issue?

#1744

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

UT in LockManagerTest.java

Ⅳ. Describe how to verify it

Run UT in LockManagerTest.java

Ⅴ. Special notes for reviews

Signed-off-by: 贝克街的流浪猫 <517375685@qq.com>
@codecov-io
Copy link

codecov-io commented Oct 12, 2019

Codecov Report

Merging #1751 into develop will increase coverage by 0.01%.
The diff coverage is 95%.

Impacted file tree graph

@@              Coverage Diff              @@
##             develop    #1751      +/-   ##
=============================================
+ Coverage      50.06%   50.08%   +0.01%     
  Complexity      2130     2130              
=============================================
  Files            411      411              
  Lines          14204    14209       +5     
  Branches        1715     1715              
=============================================
+ Hits            7111     7116       +5     
- Misses          6404     6405       +1     
+ Partials         689      688       -1
Impacted Files Coverage Δ Complexity Δ
...in/java/io/seata/server/session/BranchSession.java 80.45% <100%> (ø) 44 <0> (ø) ⬇️
...java/io/seata/server/lock/memory/MemoryLocker.java 87.2% <94.73%> (-0.45%) 20 <4> (ø)
...server/store/file/FileTransactionStoreManager.java 53.94% <0%> (+0.32%) 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 f270413...bc19157. Read the comment docs.

@xingfudeshi xingfudeshi changed the title Fix 1744 bugfix:fix memory lock is not released Oct 12, 2019
Signed-off-by: 贝克街的流浪猫 <517375685@qq.com>
Copy link
Member

@slievrly slievrly 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 changed the title bugfix:fix memory lock is not released bugfix:fix memory lock is not released due to hash conflict Oct 12, 2019
@zjinlei zjinlei merged commit 60a3e5c into apache:develop Oct 12, 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
@wangliang181230 wangliang181230 added this to the 0.9.0 milestone Aug 9, 2021
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.

5 participants