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: ChannelManager concurret Release and Watch bug #38590

Merged
merged 1 commit into from
Dec 19, 2024

Conversation

XuanYang-cn
Copy link
Contributor

See also: #38589

@sre-ci-robot sre-ci-robot added the size/L Denotes a PR that changes 100-499 lines. label Dec 19, 2024
@mergify mergify bot added dco-passed DCO check passed. kind/bug Issues or changes related a bug labels Dec 19, 2024
Copy link
Contributor

mergify bot commented Dec 19, 2024

@XuanYang-cn E2e jenkins job failed, comment /run-cpu-e2e can trigger the job again.

Copy link

codecov bot commented Dec 19, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 69.33%. Comparing base (8fcb33c) to head (fe7bfa8).
Report is 1 commits behind head on master.

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff             @@
##           master   #38590       +/-   ##
===========================================
- Coverage   81.00%   69.33%   -11.67%     
===========================================
  Files        1379      292     -1087     
  Lines      194495    26187   -168308     
===========================================
- Hits       157546    18158   -139388     
+ Misses      31393     8029    -23364     
+ Partials     5556        0     -5556     
Components Coverage Δ
Client ∅ <ø> (∅)
Core 69.33% <ø> (ø)
Go ∅ <ø> (∅)

see 1087 files with indirect coverage changes

Copy link
Contributor

mergify bot commented Dec 19, 2024

@XuanYang-cn go-sdk check failed, comment rerun go-sdk can trigger the job again.

@czs007
Copy link
Collaborator

czs007 commented Dec 19, 2024

rerun go-sdk

sre-ci-robot pushed a commit that referenced this pull request Dec 19, 2024
@czs007
Copy link
Collaborator

czs007 commented Dec 19, 2024

/approve
/lgtm

@sre-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: czs007, XuanYang-cn

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

@@ -191,7 +191,15 @@ func NewStateChannelByWatchInfo(nodeID int64, info *datapb.ChannelWatchInfo) *St
return c
}

func (c *StateChannel) TransitionOnSuccess() {
func (c *StateChannel) TransitionOnSuccess(opID int64) {
if opID != c.Info.GetOpID() {
Copy link
Member

Choose a reason for hiding this comment

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

Approve for now. But we definitely need refactor here. We need to

  1. Return the Channel status on DN (Watching/Wachted/Releasing/Released/...)
  2. Group all info for a given channel on DC to determine the next step

Copy link
Member

Choose a reason for hiding this comment

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

@mergify mergify bot added the ci-passed label Dec 19, 2024
@sre-ci-robot sre-ci-robot merged commit c0b855d into milvus-io:master Dec 19, 2024
15 checks passed
@XuanYang-cn XuanYang-cn deleted the fix-concurrent-issue branch December 20, 2024 02:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved ci-passed dco-passed DCO check passed. kind/bug Issues or changes related a bug lgtm size/L Denotes a PR that changes 100-499 lines.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants