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

Fix reload-on-touch/change #2689

Merged
merged 2 commits into from
Oct 26, 2024
Merged

Conversation

Lalufu
Copy link
Contributor

@Lalufu Lalufu commented Oct 22, 2024

As part of a fix for #2656, commit 8f1d0e5 introduced a measure to wait for processes to finish work while reloading. The code to do this affects other logic flows was well, breaking the ability to reload uwsgi when a config file changes.

This moves the code around a bit so #2656 stays fixed, but reload-on-touch/change works again.

Fixes #2681.

As part of a fix for unbit#2656, commit 8f1d0e5 introduced a measure to wait
for processes to finish work while reloading. The code to do this
affects other logic flows was well, breaking the ability to reload uwsgi
when a config file changes.

This moves the code around a bit so unbit#2656 stays fixed, but
reload-on-touch/change works again.

Fixes unbit#2681.
core/uwsgi.c Outdated Show resolved Hide resolved
core/uwsgi.c Outdated Show resolved Hide resolved
core/uwsgi.c Show resolved Hide resolved
@xrmx xrmx merged commit e77e41b into unbit:master Oct 26, 2024
27 checks passed
@xrmx
Copy link
Collaborator

xrmx commented Oct 26, 2024

Thanks a lot!

xrmx added a commit to xrmx/uwsgi that referenced this pull request Oct 26, 2024
* Fix reload-on-touch/change

As part of a fix for unbit#2656, commit 8f1d0e5 introduced a measure to wait
for processes to finish work while reloading. The code to do this
affects other logic flows was well, breaking the ability to reload uwsgi
when a config file changes.

This moves the code around a bit so unbit#2656 stays fixed, but
reload-on-touch/change works again.

Fixes unbit#2681.

* Apply suggestions from code review

---------

Co-authored-by: Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com>
@karolyi
Copy link
Contributor

karolyi commented Oct 27, 2024

Thank you very much for this! This change has fixed my spoolers not being killed (staying in defunct state), while trying to do a touch-reload. It resulted in my entire uwsgi stack hanging on reload.

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.

20.0.27 attach-daemon not responding to touching .ini file
3 participants