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

fix: failure in data query due to reconciler triggered by uncommitted transaction #5323

Merged
merged 3 commits into from
Feb 5, 2024

Conversation

guqing
Copy link
Member

@guqing guqing commented Feb 4, 2024

What type of PR is this?

/kind bugfix
/milestone 2.12.x
/area core

What this PR does / why we need it:

修复事务未提交便触发控制器执行可能导致数据状态不正确的问题

how to test it?

  1. 测试如 上传附件无法返回路径 #5315 的问题是否还存在
  2. 测试添加重名自定义模型对象会抛出异常且数据被回滚

Which issue(s) this PR fixes:

Fixes #5315

Does this PR introduce a user-facing change?

修复事务未提交便触发控制器执行可能导致数据状态不正确的问题

@f2c-ci-robot f2c-ci-robot bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. area/core Issues or PRs related to the Halo Core labels Feb 4, 2024
Copy link

f2c-ci-robot bot commented Feb 4, 2024

@guqing: The label(s) kind/bugfix cannot be applied, because the repository doesn't have them.

In response to this:

What type of PR is this?

/kind bugfix
/milestone 2.12.x
/area core

What this PR does / why we need it:

修复事务未提交便触发控制器执行可能导致数据状态不正确的问题

how to test it?

  1. 测试如 上传附件无法返回路径 #5315 的问题是否还存在
  2. 测试添加重名自定义模型对象会抛出异常且数据被回滚

Which issue(s) this PR fixes:

Fixes #5315

Does this PR introduce a user-facing change?

修复事务未提交便触发控制器执行可能导致数据状态不正确的问题

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@f2c-ci-robot f2c-ci-robot bot added this to the 2.12.x milestone Feb 4, 2024
@guqing
Copy link
Member Author

guqing commented Feb 4, 2024

/milestone 2.13.x
/cherry-pick release-2.12

@guqing
Copy link
Member Author

guqing commented Feb 4, 2024

/kind bug

@f2c-ci-robot f2c-ci-robot bot removed this from the 2.12.x milestone Feb 4, 2024
@f2c-ci-robot f2c-ci-robot bot added the kind/bug Categorizes issue or PR as related to a bug. label Feb 4, 2024
@f2c-ci-robot f2c-ci-robot bot added this to the 2.13.x milestone Feb 4, 2024
@halo-dev-bot
Copy link
Collaborator

@guqing: once the present PR merges, I will cherry-pick it on top of release-2.12 in a new PR and assign it to you.

In response to this:

/milestone 2.13.x
/cherry-pick release-2.12

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Copy link

codecov bot commented Feb 4, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (5b93667) 57.05% compared to head (7ecd23a) 57.14%.
Report is 2 commits behind head on main.

Additional details and impacted files
@@             Coverage Diff              @@
##               main    #5323      +/-   ##
============================================
+ Coverage     57.05%   57.14%   +0.08%     
- Complexity     3329     3336       +7     
============================================
  Files           587      587              
  Lines         18963    18977      +14     
  Branches       1402     1402              
============================================
+ Hits          10820    10845      +25     
+ Misses         7565     7554      -11     
  Partials        578      578              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link

sonarcloud bot commented Feb 5, 2024

Quality Gate Passed Quality Gate passed

Kudos, no new issues were introduced!

0 New issues
0 Security Hotspots
No data about Coverage
0.3% Duplication on New Code

See analysis details on SonarCloud

@guqing guqing requested a review from JohnNiang February 5, 2024 03:02
Copy link
Member

@JohnNiang JohnNiang left a comment

Choose a reason for hiding this comment

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

/approve

Copy link
Member

@ruibaby ruibaby left a comment

Choose a reason for hiding this comment

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

/lgtm

@f2c-ci-robot f2c-ci-robot bot added the lgtm Indicates that a PR is ready to be merged. label Feb 5, 2024
@ruibaby ruibaby added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 5, 2024
Copy link

f2c-ci-robot bot commented Feb 5, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JohnNiang, ruibaby

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

1 similar comment
Copy link

f2c-ci-robot bot commented Feb 5, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JohnNiang, ruibaby

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@f2c-ci-robot f2c-ci-robot bot merged commit dcef5d4 into halo-dev:main Feb 5, 2024
8 checks passed
@halo-dev-bot
Copy link
Collaborator

@guqing: new pull request created: #5329

In response to this:

/milestone 2.13.x
/cherry-pick release-2.12

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/core Issues or PRs related to the Halo Core kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

上传附件无法返回路径
4 participants