openstack/puppet-watcher
Code Issues Proposed changes

Use workers instead of threads in wsgi by default

Browse Source 
In most of puppet-openstack modules, we use workers instead of threads
in wsgi to realize concurrency of api process by default.

This patch makes puppet-watcher follow that standard configuration,
so that the default setup can be more consistent among all modules.

Change-Id: Iac7cba33f69b39e5bf29c61ed0c22b9b533b1293
This commit is contained in:
Takashi Kajinami 2020-07-05 00:07:33 +09:00
parent 06fa909c66
commit 855a5c8e44
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/wsgi/apache.pp
View File

@ -42,7 +42,7 @@
# #
# [*workers*] # [*workers*]
# Number of WSGI workers to spawn. # Number of WSGI workers to spawn.
# Optional. Defaults to 1 # Optional. Defaults to $::os_workers
# #
# [*priority*] # [*priority*]
# (optional) The priority for the vhost. # (optional) The priority for the vhost.
@ -50,7 +50,7 @@
# #
# [*threads*] # [*threads*]
# (optional) The number of threads for the vhost. # (optional) The number of threads for the vhost.
# Defaults to $::os_workers # Defaults to 1
# #
# [*access_log_file*] # [*access_log_file*]
# The log file name for the virtualhost. # The log file name for the virtualhost.
@ -102,7 +102,7 @@ class watcher::wsgi::apache (
$bind_host = undef, $bind_host = undef,
$path = '/', $path = '/',
$ssl = true, $ssl = true,
$workers = 1, $workers = $::os_workers,
$ssl_cert = undef, $ssl_cert = undef,
$ssl_key = undef, $ssl_key = undef,
$ssl_chain = undef, $ssl_chain = undef,
@ -111,7 +111,7 @@ class watcher::wsgi::apache (
$ssl_crl = undef, $ssl_crl = undef,
$ssl_certs_dir = undef, $ssl_certs_dir = undef,
$wsgi_process_display_name = undef, $wsgi_process_display_name = undef,
$threads = $::os_workers, $threads = 1,
$priority = '10', $priority = '10',
$access_log_file = false, $access_log_file = false,
$access_log_format = false, $access_log_format = false,

5
releasenotes/notes/wsgi-use-workers-02a0232bf3aac3fe.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- |
In wsgi configuration, now workers is used to define concurrency by default
instead of threads, to be consistent with the other puppet modules.

6
spec/classes/watcher_wsgi_apache_spec.rb
View File

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