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

Shut down supervisord on start in case it's running #4856

Merged
merged 7 commits into from
Apr 28, 2023

Conversation

rfay
Copy link
Member

@rfay rfay commented Apr 27, 2023

The Issue

We had intermittent failures in automated testing on TestCmdStart.

This seems to have been a result of the unusual behavior in that test: Pause all, then start all.

With the new start.sh setup, this could mean that the container wasn't being started from scratch, so supervisord was possibly already running.

The actual problem we saw was only with webserver_type=apache-fpm; apache2 not starting successfully, perhaps because it hasn't stopped properly.

How This PR Solves The Issue

  • supervisorctl shutdown at beginning of start.sh
  • Use proper graceful termination signal for apache2

Manual Testing Instructions

Try ddev start with apache-fpm, and then ddev start.

Try ddev pause and ddev start

Automated Testing Overview

Related Issue Link(s)

Release/Deployment Notes

@github-actions
Copy link

github-actions bot commented Apr 27, 2023

@rfay rfay force-pushed the 20230427_kill_supervisord branch 4 times, most recently from b7c7eee to a8c5497 Compare April 27, 2023 23:26
@rfay rfay force-pushed the 20230427_kill_supervisord branch from 83bf725 to 65aa4ab Compare April 28, 2023 00:07
@rfay rfay marked this pull request as ready for review April 28, 2023 00:07
@rfay rfay requested a review from a team as a code owner April 28, 2023 00:07
@rfay rfay merged commit 48cb370 into ddev:master Apr 28, 2023
21 checks passed
@rfay rfay deleted the 20230427_kill_supervisord branch April 28, 2023 21:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant