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: store.mode get configuration Inconsistent #1374

Merged

Conversation

zjinlei
Copy link
Contributor

@zjinlei zjinlei commented Aug 1, 2019

Ⅰ. Describe what this PR did

Ⅱ. Does this pull request fix one issue?

fix #1373 (Cooperate with pr 1379)

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

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

@zjinlei zjinlei closed this Aug 1, 2019
@zjinlei zjinlei deleted the feature/config/storemode/consistent branch August 1, 2019 10:49
@zjinlei zjinlei restored the feature/config/storemode/consistent branch August 5, 2019 08:09
@zjinlei zjinlei reopened this Aug 5, 2019
@zjinlei zjinlei changed the title file/db mode 统一配置入口 priority start parameter Aug 5, 2019
@codecov-io
Copy link

codecov-io commented Aug 5, 2019

Codecov Report

Merging #1374 into develop will increase coverage by 0.12%.
The diff coverage is 0%.

Impacted file tree graph

@@             Coverage Diff              @@
##             develop   #1374      +/-   ##
============================================
+ Coverage      45.38%   45.5%   +0.12%     
- Complexity      1660    1661       +1     
============================================
  Files            345     345              
  Lines          12666   12667       +1     
  Branches        1571    1598      +27     
============================================
+ Hits            5748    5764      +16     
- Misses          6252    6253       +1     
+ Partials         666     650      -16
Impacted Files Coverage Δ Complexity Δ
server/src/main/java/io/seata/server/Server.java 0% <0%> (ø) 0 <0> (ø) ⬇️
...o/seata/server/coordinator/DefaultCoordinator.java 50% <0%> (+0.45%) 25% <0%> (+1%) ⬆️
...rotobuf/convertor/RegisterTMResponseConvertor.java 84.84% <0%> (+3.03%) 3% <0%> (ø) ⬇️
...rotobuf/convertor/RegisterRMResponseConvertor.java 84.84% <0%> (+3.03%) 3% <0%> (ø) ⬇️
...otobuf/convertor/GlobalBeginResponseConvertor.java 96.96% <0%> (+3.03%) 3% <0%> (ø) ⬇️
...obuf/convertor/BranchRollbackRequestConvertor.java 96.42% <0%> (+3.57%) 3% <0%> (ø) ⬇️
...otobuf/convertor/BranchCommitRequestConvertor.java 100% <0%> (+3.57%) 3% <0%> (ø) ⬇️
...otobuf/convertor/BranchReportRequestConvertor.java 96.29% <0%> (+3.7%) 3% <0%> (ø) ⬇️
...protobuf/convertor/RegisterRMRequestConvertor.java 95.83% <0%> (+4.16%) 3% <0%> (ø) ⬇️
...protobuf/convertor/RegisterTMRequestConvertor.java 100% <0%> (+4.54%) 3% <0%> (ø) ⬇️
... and 5 more

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 a28dc4e...ee69660. Read the comment docs.

@zjinlei zjinlei changed the title priority start parameter unified store.mode file/db configuration Aug 5, 2019
@zjinlei zjinlei changed the title unified store.mode file/db configuration file/db mode unified configuration entry Aug 5, 2019
@slievrly
Copy link
Member

slievrly commented Aug 5, 2019

When the configuration of the store.mode is inconsistent between the configuration of the startup parameters and the configuration center, the configuration of the LockManager is the configuration of the configuration.mode of the configuration center, and the configuration priority should be followed.

@slievrly slievrly changed the title file/db mode unified configuration entry bugfix: store.mode get configuration Inconsistent Aug 5, 2019
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

@sharajava sharajava left a comment

Choose a reason for hiding this comment

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

okey to me

@slievrly slievrly merged commit e66faf9 into apache:develop Aug 8, 2019
@zjinlei zjinlei deleted the feature/config/storemode/consistent branch August 16, 2019 12:31
@wangliang181230 wangliang181230 added this to the 0.8.1 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.

io.seata.core.exception.TransactionException: null
5 participants