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

Remove sock files on nginx startup #2131

Merged
merged 13 commits into from
Jun 24, 2024

Conversation

ciarams87
Copy link
Member

Proposed changes

Problem: NGF Pod cannot recover if NGINX master process fails without cleaning up

Solution: Update the nginx Dockerfile CMD to clean up sock files on start-up

Testing: Followed the repro steps in the bug and confirmed that the pod successfully recovers after killing the NGINX master process

Closes #1108

Checklist

Before creating a PR, run through this checklist and mark each as complete.

  • I have read the CONTRIBUTING doc
  • I have added tests that prove my fix is effective or that my feature works
  • I have checked that all unit tests pass after adding my changes
  • I have updated necessary documentation
  • I have rebased my branch onto main
  • I will ensure my PR is targeting the main branch and pulling from my branch from my own fork

Release notes

If this PR introduces a change that affects users and needs to be mentioned in the release notes,
please add a brief note that summarizes the change.

Fixed issue where NGF Pod cannot recover if NGINX master process fails without cleaning up

@ciarams87 ciarams87 requested a review from a team as a code owner June 13, 2024 12:03
@github-actions github-actions bot added the bug Something isn't working label Jun 13, 2024
@sjberman
Copy link
Contributor

Test needs to be updated to remove the Skip(): #1108 (comment)

@ciarams87 ciarams87 marked this pull request as draft June 14, 2024 14:34
@github-actions github-actions bot added documentation Improvements or additions to documentation helm-chart Relates to helm chart labels Jun 18, 2024
@ciarams87 ciarams87 force-pushed the bug/rm-existing-sock-files branch 2 times, most recently from 7f507af to 70c70e9 Compare June 20, 2024 14:12
@ciarams87 ciarams87 marked this pull request as ready for review June 20, 2024 14:12
@ciarams87 ciarams87 requested a review from a team as a code owner June 20, 2024 14:12
Copy link
Contributor

@kate-osborn kate-osborn left a comment

Choose a reason for hiding this comment

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

LGTM once the tests are passing. Not sure what's causing the intermittent failure

@sjberman sjberman enabled auto-merge (squash) June 24, 2024 15:12
@sjberman sjberman merged commit 0021cec into nginxinc:main Jun 24, 2024
48 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working documentation Improvements or additions to documentation helm-chart Relates to helm chart
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

NGF Pod cannot recover if NGINX master process fails without cleaning up
4 participants