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: add serial format limit to fix OOM issue when formatting a few disks in parallel in csi-azuredisk-node #2616

Merged
merged 2 commits into from
Nov 12, 2024
Merged

fix: add serial format limit to fix OOM issue when formatting a few disks in parallel in csi-azuredisk-node #2616

merged 2 commits into from
Nov 12, 2024

Conversation

umagnus
Copy link
Contributor

@umagnus umagnus commented Nov 11, 2024 •
edited by andyzhangx
Loading

What type of PR is this?

/king bug

What this PR does / why we need it:

bug: add serial format limit to fix OOM issue when formatting a few disks in parallel in csi-azuredisk-node
add flags max-concurrent-format and concurrent-format-timeout as default 2 and 2 minutes

related to change: kubernetes/kubernetes#115379

Which issue(s) this PR fixes:

Fixes #

Requirements:

Special notes for your reviewer:

Release note:

fix: add serial format limit to fix OOM issue when formatting a few disks in parallel in csi-azuredisk-node

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Nov 11, 2024
@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Nov 11, 2024
@k8s-ci-robot
Copy link
Contributor

Hi @umagnus. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Nov 11, 2024
@andyzhangx
Copy link
Member

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Nov 11, 2024
andyzhangx
andyzhangx reviewed Nov 11, 2024
View reviewed changes
Copy link
Member

@andyzhangx andyzhangx left a comment

Choose a reason for hiding this comment

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

pls also squash all commits, thx

pkg/azuredisk/azuredisk_option.go Outdated
@@ -103,6 +105,8 @@ func (o *DriverOptions) AddFlags() *flag.FlagSet {
fs.BoolVar(&o.DisableAVSetNodes, "disable-avset-nodes", false, "disable DisableAvailabilitySetNodes in cloud config for controller")
fs.BoolVar(&o.RemoveNotReadyTaint, "remove-not-ready-taint", true, "remove NotReady taint from node when node is ready")
fs.StringVar(&o.Endpoint, "endpoint", "unix://tmp/csi.sock", "CSI endpoint")
fs.Int64Var(&o.MaxConcurrentFormat, "max-concurrent-format", 3, "maximum number of concurrent format exec calls")
Copy link
Member

Choose a reason for hiding this comment

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

set as 2

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

pkg/azuredisk/azuredisk_option.go Outdated
@@ -103,6 +105,8 @@ func (o *DriverOptions) AddFlags() *flag.FlagSet {
fs.BoolVar(&o.DisableAVSetNodes, "disable-avset-nodes", false, "disable DisableAvailabilitySetNodes in cloud config for controller")
fs.BoolVar(&o.RemoveNotReadyTaint, "remove-not-ready-taint", true, "remove NotReady taint from node when node is ready")
fs.StringVar(&o.Endpoint, "endpoint", "unix://tmp/csi.sock", "CSI endpoint")
fs.Int64Var(&o.MaxConcurrentFormat, "max-concurrent-format", 3, "maximum number of concurrent format exec calls")
fs.Int64Var(&o.ConcurrentFormatTimeout, "concurrent-format-timeout", 60, "maximum time in seconds duration of a format operation before its concurrency token is released")
Copy link
Member

Choose a reason for hiding this comment

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

set as 2min

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

@andyzhangx
Copy link
Member

/retest

@andyzhangx
Copy link
Member

/retest

1 similar comment
@andyzhangx
Copy link
Member

/retest

andyzhangx
andyzhangx approved these changes Nov 12, 2024
View reviewed changes
Copy link
Member

@andyzhangx andyzhangx left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 12, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: andyzhangx, umagnus

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 12, 2024
@andyzhangx andyzhangx merged commit 1f846d3 into kubernetes-sigs:master Nov 12, 2024
23 of 24 checks passed
@andyzhangx
Copy link
Member

/cherrypick release-1.31

@andyzhangx
Copy link
Member

/cherrypick release-1.30

@k8s-infra-cherrypick-robot
Copy link

@andyzhangx: new pull request created: #2622

In response to this:

/cherrypick release-1.31

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Nov 12, 2024
Merged
@k8s-infra-cherrypick-robot
Copy link

@andyzhangx: new pull request created: #2623

In response to this:

/cherrypick release-1.30

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Nov 12, 2024
Merged
@andyzhangx
Copy link
Member

/cherrypick release-1.29

@k8s-infra-cherrypick-robot
Copy link

@andyzhangx: #2616 failed to apply on top of branch "release-1.29":

Applying: add serial format
Using index info to reconstruct a base tree...
M	pkg/azuredisk/azuredisk.go
A	pkg/azuredisk/azuredisk_option.go
M	pkg/azuredisk/azuredisk_v2.go
M	pkg/azuredisk/fake_azuredisk.go
M	pkg/azuredisk/fake_azuredisk_v2.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/azuredisk/fake_azuredisk_v2.go
CONFLICT (content): Merge conflict in pkg/azuredisk/fake_azuredisk_v2.go
Auto-merging pkg/azuredisk/fake_azuredisk.go
CONFLICT (content): Merge conflict in pkg/azuredisk/fake_azuredisk.go
Auto-merging pkg/azuredisk/azuredisk_v2.go
CONFLICT (content): Merge conflict in pkg/azuredisk/azuredisk_v2.go
CONFLICT (modify/delete): pkg/azuredisk/azuredisk_option.go deleted in HEAD and modified in add serial format. Version add serial format of pkg/azuredisk/azuredisk_option.go left in tree.
Auto-merging pkg/azuredisk/azuredisk.go
CONFLICT (content): Merge conflict in pkg/azuredisk/azuredisk.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 add serial format

In response to this:

/cherrypick release-1.29

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@andyzhangx andyzhangx mentioned this pull request Nov 15, 2024
Merged
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andyzhangx andyzhangx andyzhangx approved these changes

@cvvz cvvz Awaiting requested review from cvvz

Assignees

@andyzhangx andyzhangx

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@umagnus @k8s-ci-robot @andyzhangx @k8s-infra-cherrypick-robot