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 l0 compactor may cause DN from OOM #33554

Merged
merged 7 commits into from
Jun 6, 2024
Merged

fix: Fix l0 compactor may cause DN from OOM #33554

merged 7 commits into from
Jun 6, 2024

Conversation

XuanYang-cn
Copy link
Contributor

See also: #33547

@sre-ci-robot sre-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines. label Jun 3, 2024
@mergify mergify bot added dco-passed DCO check passed. kind/bug Issues or changes related a bug labels Jun 3, 2024
@mergify Mergify
Copy link
Contributor

mergify bot commented Jun 3, 2024

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

@mergify Mergify
Copy link
Contributor

mergify bot commented Jun 3, 2024

@XuanYang-cn ut workflow job failed, comment rerun ut can trigger the job again.

XuanYang-cn added a commit to XuanYang-cn/milvus that referenced this pull request Jun 3, 2024
@XuanYang-cn
fix: [2.4] L0 compactor may cause DN OOM
f6eac6d 
See also: milvus-io#33547
pr: milvus-io#33554

Signed-off-by: yangxuan <[email protected]>
@XuanYang-cn XuanYang-cn mentioned this pull request Jun 3, 2024
Merged
@XuanYang-cn
fix ut
5ddc786 
Signed-off-by: yangxuan <[email protected]>
@XuanYang-cn
fix ut
2937e4f 
Signed-off-by: yangxuan <[email protected]>
@codecov Codecov
Copy link

codecov bot commented Jun 3, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 78.12500% with 77 lines in your changes missing coverage. Please review.

Project coverage is 82.00%. Comparing base (2422084) to head (89bf086).
Report is 23 commits behind head on master.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #33554      +/-   ##
==========================================
+ Coverage   81.92%   82.00%   +0.08%     
==========================================
  Files        1015     1008       -7     
  Lines      130247   130404     +157     
==========================================
+ Hits       106700   106935     +235     
+ Misses      19552    19488      -64     
+ Partials     3995     3981      -14
Files Coverage Δ
internal/datanode/data_node.go 82.20% <ø> (-0.08%) ⬇️
internal/datanode/io/binlog_io.go 90.47% <100.00%> (+4.11%) ⬆️
internal/datanode/data_sync_service.go 77.04% <66.66%> (+10.62%) ⬆️
internal/datanode/io/io_pool.go 58.33% <80.00%> (ø)
internal/datanode/services.go 80.66% <50.00%> (ø)
internal/datanode/compaction/segment_writer.go 83.76% <77.14%> (-2.83%) ⬇️
internal/datanode/compaction/l0_compactor.go 91.12% <91.12%> (ø)
internal/datanode/util/load_stats.go 48.31% <48.31%> (ø)

... and 216 files with indirect coverage changes

@XuanYang-cn
enhance by comment
a9474ef 
Signed-off-by: yangxuan <[email protected]>
@mergify mergify bot added needs-dco DCO is missing in this pull request. and removed dco-passed DCO check passed. labels Jun 4, 2024
@mergify Mergify
Copy link
Contributor

mergify bot commented Jun 4, 2024

@XuanYang-cn Thanks for your contribution. Please submit with DCO, see the contributing guide https://github.com/milvus-io/milvus/blob/master/CONTRIBUTING.md#developer-certificate-of-origin-dco.

@mergify Mergify
Copy link
Contributor

mergify bot commented Jun 4, 2024

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

@mergify Mergify
Copy link
Contributor

mergify bot commented Jun 4, 2024

@XuanYang-cn ut workflow job failed, comment rerun ut can trigger the job again.

sre-ci-robot pushed a commit that referenced this pull request Jun 5, 2024
@XuanYang-cn
fix: [2.4] L0 compactor may cause DN OOM (#33564)
95582b0 
See also: #33547
pr: #33554

---------

Signed-off-by: yangxuan <[email protected]>
@yanliang567 yanliang567 added ci-passed dco-passed DCO check passed. manual-pass manually set pass before ci-passed labeled labels Jun 5, 2024
@mergify mergify bot removed the dco-passed DCO check passed. label Jun 5, 2024
@weiliu1031
Copy link
Contributor

/lgtm

congqixia
congqixia approved these changes Jun 6, 2024
View reviewed changes
Copy link
Contributor

@congqixia congqixia left a comment

Choose a reason for hiding this comment

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

/approve

@sre-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: congqixia, 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

@sre-ci-robot sre-ci-robot merged commit 4dd0c54 into milvus-io:master Jun 6, 2024
13 of 14 checks passed
@XuanYang-cn XuanYang-cn deleted the fix-control-l0-compaction-mem-peak branch June 6, 2024 08:29
XuanYang-cn added a commit to XuanYang-cn/milvus that referenced this pull request Jun 24, 2024
@XuanYang-cn
enhance: [cherry-pick] Move compactor into sub package
d5c2dbb 
This PR consists of the following commits:

- enhance: Tidy compactor and remove dup codes (milvus-io#32198)
- fix: Fix l0 compactor may cause DN from OOM (milvus-io#33554)
- enhance: Add deltaRowCount in l0 compaction (milvus-io#33997)
- enhance: enable stream writer in compactions (milvus-io#32612)

See also: milvus-io#32451, milvus-io#33547, milvus-io#33998, milvus-io#31679
pr: milvus-io#32198, milvus-io#33554, milvus-io#33997, milvus-io#32612

Signed-off-by: yangxuan <[email protected]>
@XuanYang-cn XuanYang-cn mentioned this pull request Jun 24, 2024
Merged
sre-ci-robot pushed a commit that referenced this pull request Jun 25, 2024
@XuanYang-cn @tedxu
enhance: [cherry-pick] Move compactor into sub package (#34098)
a33b686 
This PR consists of the following commits:

- enhance: Tidy compactor and remove dup codes (#32198)
- fix: Fix l0 compactor may cause DN from OOM (#33554)
- enhance: Add deltaRowCount in l0 compaction (#33997)
- enhance: enable stream writer in compactions (#32612)
- fix: turn on compression on stream writers (#34067)
- fix: adding blob memory size in binlog serde (#33324)

See also: #32451, #33547, #33998, #31679
pr: #32198, #33554, #33997, #32612

---------

Signed-off-by: yangxuan <[email protected]>
Signed-off-by: Ted Xu <[email protected]>
Co-authored-by: Ted Xu <[email protected]>
yellow-shine pushed a commit to yellow-shine/milvus that referenced this pull request Jul 2, 2024
@XuanYang-cn @yellow-shine
fix: Fix l0 compactor may cause DN from OOM (milvus-io#33554)
32111a9 
See also: milvus-io#33547

---------

Signed-off-by: yangxuan <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@congqixia congqixia congqixia approved these changes

@cydrain cydrain Awaiting requested review from cydrain

@sunby sunby Awaiting requested review from sunby

Assignees

@weiliu1031 weiliu1031

Labels
approved ci-passed kind/bug Issues or changes related a bug lgtm manual-pass manually set pass before ci-passed labeled needs-dco DCO is missing in this pull request. size/XXL Denotes a PR that changes 1000+ lines.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@XuanYang-cn @weiliu1031 @sre-ci-robot @congqixia @yanliang567