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

enhance: [2.4] Unify LoadStateLock RLock & PinIf (#39206) #39290

Merged
merged 4 commits into from
Jan 15, 2025

Conversation

congqixia
Copy link
Contributor

@congqixia congqixia commented Jan 15, 2025

Cherry-pick from master
pr: #39206 #39308
Related to #39205

This PR merge RLock & PinIfNotReleased into PinIf function preventing segment being released before any Read operation finished.


Related to milvus-io#39205

This PR merge `RLock` & `PinIfNotReleased` into `PinIf` function
preventing segment being released before any Read operation finished.

---------

Signed-off-by: Congqi Xia <[email protected]>
@sre-ci-robot sre-ci-robot added size/L Denotes a PR that changes 100-499 lines. approved labels Jan 15, 2025
@mergify mergify bot added dco-passed DCO check passed. kind/enhancement Issues or changes related to enhancement labels Jan 15, 2025
@congqixia congqixia added this to the 2.4.21 milestone Jan 15, 2025
Copy link
Contributor

mergify bot commented Jan 15, 2025

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

@congqixia
Copy link
Contributor Author

/run-cpu-e2e

Copy link
Contributor

mergify bot commented Jan 15, 2025

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

@mergify mergify bot added the ci-passed label Jan 15, 2025
Copy link

codecov bot commented Jan 15, 2025

Codecov Report

Attention: Patch coverage is 78.30189% with 23 lines in your changes missing coverage. Please review.

Project coverage is 80.48%. Comparing base (995d5e1) to head (7322010).
Report is 3 commits behind head on 2.4.

Files with missing lines Patch % Lines
internal/querynodev2/segments/segment.go 50.00% 8 Missing and 10 partials ⚠️
...rnal/querynodev2/segments/state/load_state_lock.go 91.80% 5 Missing ⚠️
Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##              2.4   #39290      +/-   ##
==========================================
+ Coverage   80.44%   80.48%   +0.03%     
==========================================
  Files        1079     1079              
  Lines      169909   169889      -20     
==========================================
+ Hits       136678   136727      +49     
+ Misses      28730    28677      -53     
+ Partials     4501     4485      -16     
Files with missing lines Coverage Δ
pkg/util/paramtable/component_param.go 98.39% <100.00%> (+<0.01%) ⬆️
...rnal/querynodev2/segments/state/load_state_lock.go 82.78% <91.80%> (-1.59%) ⬇️
internal/querynodev2/segments/segment.go 67.74% <50.00%> (+0.08%) ⬆️

... and 41 files with indirect coverage changes

Related to milvus-io#39205
Previous PR milvus-io#39206

This PR change wait timeout behavior to log error and return to avoid
making other collection read failure in only some collections have
deadlock

Signed-off-by: Congqi Xia <[email protected]>
@mergify mergify bot removed the ci-passed label Jan 15, 2025
Signed-off-by: Congqi Xia <[email protected]>
@xiaofan-luan
Copy link
Collaborator

/lgtm
/approve

@sre-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: congqixia, xiaofan-luan

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

@mergify mergify bot added the ci-passed label Jan 15, 2025
@sre-ci-robot sre-ci-robot merged commit ca7ecdb into milvus-io:2.4 Jan 15, 2025
13 checks passed
@congqixia congqixia deleted the cp24/39206 branch January 16, 2025 02:22
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/enhancement Issues or changes related to enhancement lgtm size/L Denotes a PR that changes 100-499 lines.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants