apache wsgi: Exchange defaults for workers and threads
Due to Python's GIL [1], we can't use multiple threads for running OpenStack services without a performance penalty, since the execution ends up serialized, which defeats the purpose. Instead, we should use several processes, since this approach doesn't have this limitation. [1] https://wiki.python.org/moin/GlobalInterpreterLock Change-Id: I023e8982246672a0e99284e5e8f90fc16d87695d
This commit is contained in:
parent
ff5bc39182
commit
b02d9c3056
@ -42,7 +42,7 @@
|
||||
#
|
||||
# [*workers*]
|
||||
# Number of WSGI workers to spawn.
|
||||
# Optional. Defaults to 1
|
||||
# Optional. Defaults to $::os_workers
|
||||
#
|
||||
# [*priority*]
|
||||
# (optional) The priority for the vhost.
|
||||
@ -50,7 +50,7 @@
|
||||
#
|
||||
# [*threads*]
|
||||
# (optional) The number of threads for the vhost.
|
||||
# Defaults to $::os_workers
|
||||
# Defaults to 1
|
||||
#
|
||||
# [*wsgi_process_display_name*]
|
||||
# (optional) Name of the WSGI process display-name.
|
||||
@ -95,7 +95,7 @@ class ironic::wsgi::apache (
|
||||
$bind_host = undef,
|
||||
$path = '/',
|
||||
$ssl = true,
|
||||
$workers = 1,
|
||||
$workers = $::os_workers,
|
||||
$ssl_cert = undef,
|
||||
$ssl_key = undef,
|
||||
$ssl_chain = undef,
|
||||
@ -104,7 +104,7 @@ class ironic::wsgi::apache (
|
||||
$ssl_crl = undef,
|
||||
$ssl_certs_dir = undef,
|
||||
$wsgi_process_display_name = undef,
|
||||
$threads = $::os_workers,
|
||||
$threads = 1,
|
||||
$priority = '10',
|
||||
$access_log_file = false,
|
||||
$access_log_format = false,
|
||||
|
@ -14,9 +14,9 @@ describe 'ironic::wsgi::apache' do
|
||||
:path => '/',
|
||||
:servername => facts[:fqdn],
|
||||
:ssl => true,
|
||||
:threads => facts[:os_workers],
|
||||
:threads => 1,
|
||||
:user => 'ironic',
|
||||
:workers => 1,
|
||||
:workers => facts[:os_workers],
|
||||
:wsgi_daemon_process => 'ironic',
|
||||
:wsgi_process_group => 'ironic',
|
||||
:wsgi_script_dir => platform_params[:wsgi_script_path],
|
||||
@ -52,7 +52,7 @@ describe 'ironic::wsgi::apache' do
|
||||
:path => '/',
|
||||
:servername => 'dummy.host',
|
||||
:ssl => false,
|
||||
:threads => facts[:os_workers],
|
||||
:threads => 1,
|
||||
:user => 'ironic',
|
||||
:workers => 37,
|
||||
:wsgi_daemon_process => 'ironic',
|
||||
|
Loading…
x
Reference in New Issue
Block a user