jingrow/gunicorn
1
0
Fork 0
mirror of https://github.com/frappe/gunicorn.git synced 2026-01-14 11:09:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Reap workers in SIGCHLD handler

Browse Source 
This commit tries to minimize the chance of sending a kill signal
to a process that is not a gunicorn worker by reaping children
as soon as the SIGCHLD is received.

Close #371
This commit is contained in:
Randall Leeds 2014-03-08 15:15:33 -08:00
parent 12e5482a4a
commit 24a060ed02
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gunicorn/arbiter.py
View File

@ -172,7 +172,6 @@ class Arbiter(object):
self.manage_workers() self.manage_workers()
while True: while True:
try: try:
self.reap_workers()
sig = self.SIG_QUEUE.pop(0) if len(self.SIG_QUEUE) else None sig = self.SIG_QUEUE.pop(0) if len(self.SIG_QUEUE) else None
if sig is None: if sig is None:
self.sleep() self.sleep()
@ -210,6 +209,7 @@ class Arbiter(object):
def handle_chld(self, sig, frame): def handle_chld(self, sig, frame):
"SIGCHLD handling" "SIGCHLD handling"
self.reap_workers()
self.wakeup() self.wakeup()
def handle_hup(self): def handle_hup(self):
@ -306,7 +306,8 @@ class Arbiter(object):
A readable PIPE means a signal occurred. A readable PIPE means a signal occurred.
""" """
if self.WORKERS: if self.WORKERS:
oldest = min(w.tmp.last_update() for w in self.WORKERS.values()) worker_values = list(self.WORKERS.values())
oldest = min(w.tmp.last_update() for w in worker_values)
timeout = self.timeout - (time.time() - oldest) timeout = self.timeout - (time.time() - oldest)
# The timeout can be reached, so don't wait for a negative value # The timeout can be reached, so don't wait for a negative value
timeout = max(timeout, 1.0) timeout = max(timeout, 1.0)
@ -342,7 +343,6 @@ class Arbiter(object):
while self.WORKERS and time.time() < limit: while self.WORKERS and time.time() < limit:
self.kill_workers(sig) self.kill_workers(sig)
time.sleep(0.1) time.sleep(0.1)
self.reap_workers()
self.kill_workers(signal.SIGKILL) self.kill_workers(signal.SIGKILL)
def reexec(self): def reexec(self):
@ -426,7 +426,8 @@ class Arbiter(object):
""" """
if not self.timeout: if not self.timeout:
return return
for (pid, worker) in self.WORKERS.items(): workers = list(self.WORKERS.items())
for (pid, worker) in workers:
try: try:
if time.time() - worker.tmp.last_update() <= self.timeout: if time.time() - worker.tmp.last_update() <= self.timeout:
continue continue
@ -538,7 +539,8 @@ class Arbiter(object):
Kill all workers with the signal `sig` Kill all workers with the signal `sig`
:attr sig: `signal.SIG*` value :attr sig: `signal.SIG*` value
""" """
for pid in self.WORKERS.keys(): worker_pids = list(self.WORKERS.keys())
for pid in worker_pids:
self.kill_worker(pid, sig) self.kill_worker(pid, sig)
def kill_worker(self, pid, sig): def kill_worker(self, pid, sig):