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 thread synchronization issue #6245 #7800

Merged
merged 1 commit into from
Oct 24, 2021
Merged

fix: fix thread synchronization issue #6245 #7800

merged 1 commit into from
Oct 24, 2021

Conversation

ctron
Copy link
Contributor

@ctron ctron commented Oct 12, 2021

What this PR does / why we need it:

fixes #6245

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Documentation only

Which issue/s this PR fixes

fixes #6245

How Has This Been Tested?

Checklist:

  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I've read the CONTRIBUTION guide
  • I have added tests to cover my changes.
  • All new and existing tests passed.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Oct 12, 2021
@k8s-ci-robot
Copy link
Contributor

@ctron: This issue is currently awaiting triage.

If Ingress contributors determines this is a relevant issue, they will accept it by applying the triage/accepted label and provide further guidance.

The triage/accepted label can be added by org members by writing /triage accepted in a comment.

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/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. label Oct 12, 2021
@k8s-ci-robot
Copy link
Contributor

Welcome @ctron!

It looks like this is your first PR to kubernetes/ingress-nginx 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes/ingress-nginx has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot k8s-ci-robot added needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. needs-priority labels Oct 12, 2021
@k8s-ci-robot
Copy link
Contributor

Hi @ctron. Thanks for your PR.

I'm waiting for a kubernetes 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/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Oct 12, 2021
@ctron ctron force-pushed the feature/fix_6245_1 branch from 7a4f8fb to a18af2a Compare October 12, 2021 10:58
@rikatz
Copy link
Contributor

rikatz commented Oct 12, 2021

/ok-to-test
We were discussing about this today :) Thanks for the PR.

I wanna just make sure that in scale situations we wouldn't get into a lock condition always trying to regenerate the nginx.conf file

@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 Oct 12, 2021
@rikatz rikatz added this to the v1.0.5 milestone Oct 12, 2021
@strongjz
Copy link
Member

/retest

@ctron ctron force-pushed the feature/fix_6245_1 branch from a18af2a to f242ad0 Compare October 13, 2021 06:59
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Oct 13, 2021
@ctron ctron force-pushed the feature/fix_6245_1 branch from f242ad0 to f9f7b5f Compare October 13, 2021 07:14
@k8s-ci-robot k8s-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Oct 13, 2021
@ctron
Copy link
Contributor Author

ctron commented Oct 13, 2021

I wanna just make sure that in scale situations we wouldn't get into a lock condition always trying to regenerate the nginx.conf file

Well, there is always a trade-off … somehow access needs to be synced.

A dug a bit deeper to check out if there could be an alternative to simply locking the template writer. After checking the implementation of the writer, I noticed that my fix didn't actually fix. As the function returns a slice (which again is just a pointer) the content of that slice still might get modified, as there is a buffer pool in play.

So I swapped out the lock for a copy of the buffer resulting buffer. Honestly, I am not sure why there is a buffer in there. I guess to work around Go's garbage collector.

Now the implementation expects the interface implementation to return a buffer it no longer mutates. With the downside of making a copy of the buffer before returning it to the caller.

Maybe a further improvement would be, if the outCmdBuf didn't come from a pool, but would be a dedicated instance.

@ctron
Copy link
Contributor Author

ctron commented Oct 13, 2021

/retest

@ctron ctron force-pushed the feature/fix_6245_1 branch from f9f7b5f to 8d97901 Compare October 13, 2021 08:21
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Oct 13, 2021
@ctron
Copy link
Contributor Author

ctron commented Oct 19, 2021

@rikatz @strongjz Is there any update or feedback on this?

@rikatz
Copy link
Contributor

rikatz commented Oct 24, 2021

@ctron let me check again :)

@rikatz
Copy link
Contributor

rikatz commented Oct 24, 2021

/lgtm
/approve

Seems like a clever solution, I would anyway keep an eye on it to see if it generates some sort of performance impact in a future.

Thanks!

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ctron, rikatz

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 Oct 24, 2021
@k8s-ci-robot k8s-ci-robot merged commit 880ea6d into kubernetes:main Oct 24, 2021
@ctron ctron deleted the feature/fix_6245_1 branch October 25, 2021 06:48
rikatz pushed a commit to rikatz/ingress-nginx that referenced this pull request Nov 16, 2021
@ctron @rikatz
fix: fix thread synchronization issue kubernetes#6245 (kubernetes#7800)
2205718
@rikatz rikatz mentioned this pull request Nov 16, 2021
Merged
k8s-ci-robot pushed a commit that referenced this pull request Nov 16, 2021
@rikatz @ctron
Legacy cherrypick (#7925)
b159577 
* fix: fix thread synchronization issue #6245 (#7800)

* Add option to sanitize annotation inputs (#7874)

* Add option to sanitize annotation inputs

* Fix e2e tests after string sanitization

* Add proxy_pass and serviceaccount as denied values

* Trim spaces from badword items (#7921)

* Fix tests from cherrypick

Co-authored-by: Jens Reimann <[email protected]>
rchshld pushed a commit to joomcode/ingress-nginx that referenced this pull request May 19, 2023
@ctron @rchshld
fix: fix thread synchronization issue kubernetes#6245 (kubernetes#7800)
973cd34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rikatz rikatz Awaiting requested review from rikatz

@strongjz strongjz Awaiting requested review from strongjz

Assignees

@rikatz rikatz

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. needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-priority needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
v1.0.5
Development

Successfully merging this pull request may close these issues.

Generated /tmp/nginx-cfg File Invalid When Creating Many Ingress Objects Simultaneously
4 participants
@ctron @k8s-ci-robot @rikatz @strongjz