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.

Sign up for GitHub

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

Jump to bottom

fix: Fix panic due to failed to seek (#34229) #34230

Merged
merged 6 commits into from
Jul 1, 2024
Merged

fix: Fix panic due to failed to seek (#34229) #34230

merged 6 commits into from
Jul 1, 2024

Conversation

bigsheeper
Copy link
Contributor

@bigsheeper bigsheeper commented Jun 27, 2024 •
edited
Loading

Converting the same msgposition's vchannel to a pchannel multiple times would result in an invalid pchannel, leading to seek failure and panic. This PR:

  1. Make a copy of msgposition in msgdispatcher.
  2. Check if channel is already a pchannel, no further channel conversion is performed.

issue: #34221

pr: #34229

@bigsheeper
fix: Fix panic due to failed to seek
1a1d32d 
Signed-off-by: bigsheeper <yihao.dai@zilliz.com>
@sre-ci-robot sre-ci-robot added the size/XS Denotes a PR that changes 0-9 lines. label Jun 27, 2024
@mergify mergify bot added dco-passed DCO check passed. kind/bug Issues or changes related a bug labels Jun 27, 2024
@bigsheeper
enhance ToPhysicalChannel
92ca78d 
Signed-off-by: bigsheeper <yihao.dai@zilliz.com>
@sre-ci-robot sre-ci-robot added size/S Denotes a PR that changes 10-29 lines. and removed size/XS Denotes a PR that changes 0-9 lines. labels Jun 27, 2024
@bigsheeper
fix ut
a29a15f 
Signed-off-by: bigsheeper <yihao.dai@zilliz.com>
@bigsheeper
Merge branch '2.4' of https://github.com/milvus-io/milvus into 2406-f…
890e971 
…ix-seek-failed-2.4
@SimFG
Copy link
Contributor

SimFG commented Jun 28, 2024

/lgtm

@mergify mergify bot added the ci-passed label Jun 28, 2024
@codecov Codecov
Copy link

codecov bot commented Jun 28, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 85.66%. Comparing base (fc6bd38) to head (1a68408).
Report is 5 commits behind head on 2.4.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##              2.4   #34230      +/-   ##
==========================================
+ Coverage   81.82%   85.66%   +3.83%     
==========================================
  Files        1010      761     -249     
  Lines      130787   107894   -22893     
==========================================
- Hits       107021    92424   -14597     
+ Misses      19766    11464    -8302     
- Partials     4000     4006       +6
Files Coverage Δ
pkg/mq/msgdispatcher/dispatcher.go 96.62% <100.00%> (+2.06%) ⬆️
pkg/util/funcutil/func.go 91.57% <100.00%> (+0.11%) ⬆️

... and 283 files with indirect coverage changes

@bigsheeper
fix ut
07e75ec 
Signed-off-by: bigsheeper <yihao.dai@zilliz.com>
@bigsheeper
Merge branch '2.4' of https://github.com/milvus-io/milvus into 2406-f…
1a68408 
…ix-seek-failed-2.4
@sre-ci-robot sre-ci-robot added size/M Denotes a PR that changes 30-99 lines. and removed lgtm size/S Denotes a PR that changes 10-29 lines. labels Jul 1, 2024
@mergify mergify bot added ci-passed and removed ci-passed labels Jul 1, 2024
@czs007
Copy link
Contributor

czs007 commented Jul 1, 2024

/approve
/lgtm

@sre-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bigsheeper, czs007

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

@sre-ci-robot sre-ci-robot merged commit 3af0d91 into milvus-io:2.4 Jul 1, 2024
11 of 12 checks passed
bigsheeper added a commit to bigsheeper/milvus that referenced this pull request Jul 12, 2024
@bigsheeper
fix: Fix panic due to failed to seek (milvus-io#34229) (milvus-io#34230)
414c00a 
Signed-off-by: bigsheeper <yihao.dai@zilliz.com>
@bigsheeper bigsheeper mentioned this pull request Jul 12, 2024
Merged
sre-ci-robot pushed a commit that referenced this pull request Jul 13, 2024
@bigsheeper @SimFG
fix: [cherry-pick] Batch pick bug fix PRs (#34657)
9e593f8 
This PR cherry-picks the following commits that fix bugs:

- #34563
- #34230
- #34071
- #34302
- #34566

issue: #34255,
#34221,
#34068,
#34247,

pr: #34563,
#34230,
#34071,
#34302,
#34566

---------

Signed-off-by: bigsheeper <yihao.dai@zilliz.com>
Co-authored-by: SimFG <bang.fu@zilliz.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@czs007 czs007 Awaiting requested review from czs007

@yanliang567 yanliang567 Awaiting requested review from yanliang567

Assignees

@SimFG SimFG

@czs007 czs007

Labels
approved ci-passed dco-passed DCO check passed. kind/bug Issues or changes related a bug lgtm size/M Denotes a PR that changes 30-99 lines.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@bigsheeper @SimFG @czs007 @sre-ci-robot