openstack
/
puppet-ironic
Code Issues Proposed changes

Merge "Correct default number of threads"

This commit is contained in:
Zuul 2018-08-24 15:22:36 +00:00 committed by Gerrit Code Review
parent 3e773e3361 037cd2cb5d
commit 7f0e56d305
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/wsgi/apache.pp
View File

@ -50,7 +50,7 @@
#
# [*threads*]
# (optional) The number of threads for the vhost.
# Defaults to 1
# Defaults to 15
#
# [*wsgi_process_display_name*]
# (optional) Name of the WSGI process display-name.
@ -112,7 +112,7 @@ class ironic::wsgi::apache (
$ssl_crl = undef,
$ssl_certs_dir = undef,
$wsgi_process_display_name = undef,
$threads = 1,
$threads = 15,
$priority = '10',
$access_log_file = false,
$access_log_format = false,

9
releasenotes/notes/update-threads-to-match-upstream-6fda517d7f6d1448.yaml Normal file
View File

@ -0,0 +1,9 @@
---
fixes:
- |
Fixes default configuration where only a single concurrent thread was
permitted per WSGI worker process, which does not match the upstream
configuration where threads are enabled per each spawned worker process.
This allows for greater request concurrency to prevent situations where
the webserver may incorrectly return a 500 error due to the server being
unable to process the request in time.

4
spec/classes/ironic_wsgi_apache_spec.rb
View File

@ -14,7 +14,7 @@ describe 'ironic::wsgi::apache' do
:path => '/',
:servername => facts[:fqdn],
:ssl => true,
:threads => 1,
:threads => 15,
:user => 'ironic',
:workers => facts[:os_workers],
:wsgi_daemon_process => 'ironic',
@ -56,7 +56,7 @@ describe 'ironic::wsgi::apache' do
:path => '/',
:servername => 'dummy.host',
:ssl => false,
:threads => 1,
:threads => 15,
:user => 'ironic',
:workers => 37,
:wsgi_daemon_process => 'ironic',