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: Unify LoadStateLock RLock & PinIf #39206

Merged
merged 3 commits into from
Jan 14, 2025

Conversation

congqixia
Copy link
Contributor

Related to #39205

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

@sre-ci-robot sre-ci-robot added size/L Denotes a PR that changes 100-499 lines. approved labels Jan 13, 2025
@mergify mergify bot added dco-passed DCO check passed. kind/enhancement Issues or changes related to enhancement labels Jan 13, 2025
@chyezh
Copy link
Contributor

chyezh commented Jan 13, 2025

/lgtm

Copy link
Contributor

mergify bot commented Jan 13, 2025

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

Copy link
Contributor

mergify bot commented Jan 13, 2025

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

Copy link

codecov bot commented Jan 13, 2025

Codecov Report

Attention: Patch coverage is 82.65306% with 17 lines in your changes missing coverage. Please review.

Project coverage is 81.15%. Comparing base (da1b786) to head (cfda1de).
Report is 4 commits behind head on master.

Files with missing lines Patch % Lines
internal/querynodev2/segments/segment.go 58.06% 2 Missing and 11 partials ⚠️
...rnal/querynodev2/segments/state/load_state_lock.go 93.10% 4 Missing ⚠️
Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #39206      +/-   ##
==========================================
- Coverage   81.16%   81.15%   -0.01%     
==========================================
  Files        1399     1404       +5     
  Lines      197579   197713     +134     
==========================================
+ Hits       160357   160446      +89     
- Misses      31593    31638      +45     
  Partials     5629     5629              
Components Coverage Δ
Client 79.53% <ø> (ø)
Core 69.71% <ø> (-0.02%) ⬇️
Go 83.08% <82.65%> (-0.02%) ⬇️
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 83.33% <93.10%> (-1.05%) ⬇️
internal/querynodev2/segments/segment.go 67.58% <58.06%> (ø)

... and 45 files with indirect coverage changes

@congqixia congqixia force-pushed the enhance/unify_rlock_pinif branch from 5b87cec to 9eaa8b3 Compare January 13, 2025 11:01
@sre-ci-robot sre-ci-robot removed the lgtm label Jan 13, 2025
@sre-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: congqixia

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

Copy link
Contributor

mergify bot commented Jan 13, 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 13, 2025

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

@congqixia
Copy link
Contributor Author

/run-cpu-e2e

@mergify mergify bot added the ci-passed label Jan 14, 2025
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]>
@congqixia congqixia force-pushed the enhance/unify_rlock_pinif branch from 9eaa8b3 to cfda1de Compare January 14, 2025 07:36
@mergify mergify bot removed the ci-passed label Jan 14, 2025
@chyezh
Copy link
Contributor

chyezh commented Jan 14, 2025

/lgtm

@sre-ci-robot sre-ci-robot merged commit d89768f into milvus-io:master Jan 14, 2025
19 of 20 checks passed
congqixia added a commit to congqixia/milvus that referenced this pull request Jan 14, 2025
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]>
congqixia added a commit to congqixia/milvus that referenced this pull request Jan 15, 2025
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]>
congqixia added a commit to congqixia/milvus that referenced this pull request Jan 15, 2025
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]>
congqixia added a commit to congqixia/milvus that referenced this pull request Jan 15, 2025
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]>
congqixia added a commit to congqixia/milvus that referenced this pull request Jan 15, 2025
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]>
sre-ci-robot pushed a commit that referenced this pull request 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.

---------

---------

Signed-off-by: Congqi Xia <[email protected]>
sre-ci-robot pushed a commit that referenced this pull request 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.

---------

---------

Signed-off-by: Congqi Xia <[email protected]>
sre-ci-robot pushed a commit that referenced this pull request Jan 15, 2025
…9308)

Related to #39205
Previous PR #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]>
@congqixia congqixia deleted the enhance/unify_rlock_pinif branch January 16, 2025 02:22
gifi-siby pushed a commit to gifi-siby/milvus that referenced this pull request Jan 16, 2025
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]>
gifi-siby pushed a commit to gifi-siby/milvus that referenced this pull request Jan 16, 2025
…lvus-io#39308)

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]>
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