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

[IMP] OO-862 Kill workers with SIGTERM instead of SIGKILL. #50

Open
wants to merge 1 commit into
base: 15.0
Choose a base branch
from
Open

[IMP] OO-862 Kill workers with SIGTERM instead of SIGKILL. #50

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 30 additions & 5 deletions odoo/service/server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
#-----------------------------------------------------------
# Threaded, Gevent and Prefork Servers
#-----------------------------------------------------------
import ctypes
import datetime
import errno
import logging
import os
import os.path
import platform
import random
import requests
import select
import signal
import socket
Expand Down Expand Up @@ -826,7 +828,10 @@ def process_timeout(self):
worker.__class__.__name__,
pid,
worker.watchdog_timeout)
self.worker_kill(pid, signal.SIGKILL)
if (now - worker.watchdog_time) >= worker.watchdog_timeout + 5:
self.worker_kill(pid, signal.SIGKILL)
else:
self.worker_kill(pid, signal.SIGABRT)

def process_spawn(self):
if config['http_enable']:
Expand Down Expand Up @@ -946,6 +951,7 @@ def __init__(self, multi):
self.ppid = os.getpid()
self.pid = None
self.alive = True
self.thread = None
# should we rename into lifetime ?
self.request_max = multi.limit_request
self.request_count = 0
Expand All @@ -969,6 +975,24 @@ def signal_time_expired_handler(self, n, stack):
# We dont suicide in such case
raise Exception('CPU time limit exceeded.')

def signal_time_real_handler(self, sig, frame):
_logger.info('Worker (%d) real time limit (%s) reached.', self.pid, config['limit_time_real'])
thread_id = None
if hasattr(self.thread, '_thread_id'):
thread_id = self.thread._thread_id
for id, thread in threading._active.items():
if thread is self.thread:
thread_id = id
if not thread_id:
raise Exception('Failed to determine thread id.')

res = ctypes.pythonapi.PyThreadState_SetAsyncExc(thread_id, ctypes.py_object(SystemExit))
if res > 1:
ctypes.pythonapi.PyThreadState_SetAsyncExc(thread_id, 0)
# print('Exception raise failure')

# raise Exception('Real time limit exceeded.')

def sleep(self):
try:
select.select([self.multi.socket, self.wakeup_fd_r], [], [], self.multi.beat)
Expand Down Expand Up @@ -1017,6 +1041,7 @@ def start(self):
# reset blocking status
self.multi.socket.setblocking(0)

signal.signal(signal.SIGABRT, self.signal_time_real_handler)
signal.signal(signal.SIGINT, self.signal_handler)
signal.signal(signal.SIGXCPU, self.signal_time_expired_handler)

Expand All @@ -1034,10 +1059,10 @@ def stop(self):
def run(self):
try:
self.start()
t = threading.Thread(name="Worker %s (%s) workthread" % (self.__class__.__name__, self.pid), target=self._runloop)
t.daemon = True
t.start()
t.join()
self.thread = threading.Thread(name="Worker %s (%s) workthread" % (self.__class__.__name__, self.pid), target=self._runloop)
self.thread.daemon = True
self.thread.start()
self.thread.join()
_logger.info("Worker (%s) exiting. request_count: %s, registry count: %s.",
self.pid, self.request_count,
len(odoo.modules.registry.Registry.registries))
Expand Down