From d3b12f6937f8a20f7e1d4d64c05cc4c7f540c5a4 Mon Sep 17 00:00:00 2001
From: Maksym Yatsenko <myatsenko@mirantis.com>
Date: Fri, 7 Oct 2016 17:17:56 +0300
Subject: [PATCH] Change worker defaults to ::os_workers

This patch changes the default worker count from ::processorcount to the
new ::os_workers fact. ::os_workers is based on the number of processors
(currently cpu/4) but is capped at a maximum of 8 worker processors.
This is a much more reasonable default in general and prevents excessive
resource consumption on systems with a large number of CPUs.

Change-Id: Id7c5f3df32b4f350d93ed85b6293fe69e64c2cc3
---
 manifests/wsgi/apache.pp                                     | 4 ++--
 .../notes/os_workers_for_worker_count-d1ea2ef2beb0d686.yaml  | 5 +++++
 spec/classes/aodh_api_spec.rb                                | 1 -
 spec/classes/aodh_db_sync_spec.rb                            | 2 +-
 spec/classes/aodh_evaluator_spec.rb                          | 1 -
 spec/classes/aodh_wsgi_apache_spec.rb                        | 2 +-
 6 files changed, 9 insertions(+), 6 deletions(-)
 create mode 100644 releasenotes/notes/os_workers_for_worker_count-d1ea2ef2beb0d686.yaml

diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp
index a9119b35..efb69932 100644
--- a/manifests/wsgi/apache.pp
+++ b/manifests/wsgi/apache.pp
@@ -54,7 +54,7 @@
 #
 #   [*threads*]
 #     (optional) The number of threads for the vhost.
-#     Defaults to $::processorcount
+#     Defaults to $::os_workers
 #
 #   [*ssl_cert*]
 #   [*ssl_key*]
@@ -90,7 +90,7 @@ class aodh::wsgi::apache (
   $ssl_crl_path  = undef,
   $ssl_crl       = undef,
   $ssl_certs_dir = undef,
-  $threads       = $::processorcount,
+  $threads       = $::os_workers,
   $priority      = '10',
 ) {
 
diff --git a/releasenotes/notes/os_workers_for_worker_count-d1ea2ef2beb0d686.yaml b/releasenotes/notes/os_workers_for_worker_count-d1ea2ef2beb0d686.yaml
new file mode 100644
index 00000000..5616f0d7
--- /dev/null
+++ b/releasenotes/notes/os_workers_for_worker_count-d1ea2ef2beb0d686.yaml
@@ -0,0 +1,5 @@
+---
+other:
+  - Parameters that control the number of spawned child processes for
+    distributing processing have had their default value changed from
+    ::processorcount to ::os_workers.
diff --git a/spec/classes/aodh_api_spec.rb b/spec/classes/aodh_api_spec.rb
index 32520123..81b0d52a 100644
--- a/spec/classes/aodh_api_spec.rb
+++ b/spec/classes/aodh_api_spec.rb
@@ -189,7 +189,6 @@ describe 'aodh::api' do
       let (:facts) do
         facts.merge!(OSDefaults.get_facts({
           :fqdn           => 'some.host.tld',
-          :processorcount => 2,
           :concat_basedir => '/var/lib/puppet/concat'
         }))
       end
diff --git a/spec/classes/aodh_db_sync_spec.rb b/spec/classes/aodh_db_sync_spec.rb
index c3e7cfec..aa53175c 100644
--- a/spec/classes/aodh_db_sync_spec.rb
+++ b/spec/classes/aodh_db_sync_spec.rb
@@ -22,7 +22,7 @@ describe 'aodh::db::sync' do
     context "on #{os}" do
       let (:facts) do
         facts.merge(OSDefaults.get_facts({
-          :processorcount => 8,
+          :os_workers     => 8,
           :concat_basedir => '/var/lib/puppet/concat'
         }))
       end
diff --git a/spec/classes/aodh_evaluator_spec.rb b/spec/classes/aodh_evaluator_spec.rb
index 343fe0f5..c9a4d71c 100644
--- a/spec/classes/aodh_evaluator_spec.rb
+++ b/spec/classes/aodh_evaluator_spec.rb
@@ -90,7 +90,6 @@ describe 'aodh::evaluator' do
       let (:facts) do
         facts.merge!(OSDefaults.get_facts({
           :fqdn           => 'some.host.tld',
-          :processorcount => 2,
           :concat_basedir => '/var/lib/puppet/concat'
         }))
       end
diff --git a/spec/classes/aodh_wsgi_apache_spec.rb b/spec/classes/aodh_wsgi_apache_spec.rb
index 4c143b9a..2c6a1b6a 100644
--- a/spec/classes/aodh_wsgi_apache_spec.rb
+++ b/spec/classes/aodh_wsgi_apache_spec.rb
@@ -79,7 +79,7 @@ describe 'aodh::wsgi::apache' do
     context "on #{os}" do
       let (:facts) do
         facts.merge!(OSDefaults.get_facts({
-          :processorcount => 42,
+          :os_workers     => 8,
           :concat_basedir => '/var/lib/puppet/concat',
           :fqdn           => 'some.host.tld'
         }))