odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] cron: the maximum number of cron threads is configurable. 

bzr revid: vmt@openerp.com-20110808135453-qdlhkyupb6803jln
This commit is contained in:
Vo Minh Thu 2011-08-08 15:54:53 +02:00
parent ed1b2a92ca
commit d803d9192b
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openerp/conf/__init__.py
View File

@ -32,4 +32,10 @@ of paths.
import deprecation import deprecation
# Maximum number of threads processing concurrently cron jobs.
# Access to this variable must be thread-safe; they have to be done
# through the functions in openerp.cron.
max_cron_threads = 4 # Actually the default value here is meaningless,
# look at tools.config for the default value.
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

14
openerp/cron.py
View File

@ -64,10 +64,8 @@ _wakeup_by_db = {}
# while spawning a few threads. # while spawning a few threads.
_wakeups_lock = threading.RLock() _wakeups_lock = threading.RLock()
# Maximum number of threads allowed to process cron jobs concurrently. # A (non re-entrant) lock to protect the openerp.conf.max_cron_threads
_thread_count = 2 # TODO make it configurable # variable.
# A (non re-entrant) lock to protect the above _thread_count variable.
_thread_count_lock = threading.Lock() _thread_count_lock = threading.Lock()
_logger = logging.getLogger('cron') _logger = logging.getLogger('cron')
@ -75,21 +73,19 @@ _logger = logging.getLogger('cron')
def get_thread_count(): def get_thread_count():
""" Return the number of available threads. """ """ Return the number of available threads. """
return _thread_count return openerp.conf.max_cron_threads
def inc_thread_count(): def inc_thread_count():
""" Increment by the number of available threads. """ """ Increment by the number of available threads. """
global _thread_count
with _thread_count_lock: with _thread_count_lock:
_thread_count += 1 openerp.conf.max_cron_threads += 1
def dec_thread_count(): def dec_thread_count():
""" Decrement by the number of available threads. """ """ Decrement by the number of available threads. """
global _thread_count
with _thread_count_lock: with _thread_count_lock:
_thread_count -= 1 openerp.conf.max_cron_threads -= 1
def cancel(db_name): def cancel(db_name):

8
openerp/tools/config.py
View File

@ -24,6 +24,7 @@ import optparse
import os import os
import sys import sys
import openerp import openerp
import openerp.conf
import openerp.loglevels as loglevels import openerp.loglevels as loglevels
import logging import logging
import openerp.release as release import openerp.release as release
@ -250,6 +251,9 @@ class configmanager(object):
"osv_memory tables. This is a decimal value expressed in hours, " "osv_memory tables. This is a decimal value expressed in hours, "
"and the default is 1 hour.", "and the default is 1 hour.",
type="float") type="float")
group.add_option("--max-cron-threads", dest="max_cron_threads", my_default=4,
help="Maximum number of threads processing concurrently cron jobs.",
type="int")
parser.add_option_group(group) parser.add_option_group(group)
# Copy all optparse options (i.e. MyOption) into self.options. # Copy all optparse options (i.e. MyOption) into self.options.
@ -335,7 +339,7 @@ class configmanager(object):
'stop_after_init', 'logrotate', 'without_demo', 'netrpc', 'xmlrpc', 'syslog', 'stop_after_init', 'logrotate', 'without_demo', 'netrpc', 'xmlrpc', 'syslog',
'list_db', 'xmlrpcs', 'list_db', 'xmlrpcs',
'test_file', 'test_disable', 'test_commit', 'test_report_directory', 'test_file', 'test_disable', 'test_commit', 'test_report_directory',
'osv_memory_count_limit', 'osv_memory_age_limit', 'osv_memory_count_limit', 'osv_memory_age_limit', 'max_cron_threads',
] ]
for arg in keys: for arg in keys:
@ -417,6 +421,8 @@ class configmanager(object):
if opt.save: if opt.save:
self.save() self.save()
openerp.conf.max_cron_threads = self.options['max_cron_threads']
def _generate_pgpassfile(self): def _generate_pgpassfile(self):
""" """
Generate the pgpass file with the parameters from the command line (db_host, db_user, Generate the pgpass file with the parameters from the command line (db_host, db_user,