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: I6b994becf8963020a56902785e2c569553c95a14

diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp
index e6e0c638a59a87cf01b14f57a6355aa6a0a0650c..a87458f76fb3d1bce3b11da5aa48a682e359034e 100644 (file)
--- a/manifests/wsgi/apache.pp
+++ b/manifests/wsgi/apache.pp
@@ -56,7 +56,7 @@
 #
 # [*threads*]
 #   (Optional) The number of threads for the vhost.
-#   Defaults to $::processorcount.
+#   Defaults to $::os_workers.
 #
 # [*ssl_cert*]
 # [*ssl_key*]
@@ -92,7 +92,7 @@ class ceilometer::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-05563e8178495993.yaml b/releasenotes/notes/os_workers_for_worker_count-05563e8178495993.yaml
new file mode 100644 (file)
index 0000000..5616f0d
--- /dev/null
+++ b/releasenotes/notes/os_workers_for_worker_count-05563e8178495993.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/ceilometer_api_spec.rb b/spec/classes/ceilometer_api_spec.rb
index 0739743fbc84de617778dd711c8b22880403260a..e0ccda5649434759d6d5078f4bcae8d345ce441b 100644 (file)
--- a/spec/classes/ceilometer_api_spec.rb
+++ b/spec/classes/ceilometer_api_spec.rb
@@ -156,7 +156,7 @@ describe 'ceilometer::api' do
         :operatingsystemrelease => '8.0',
         :concat_basedir         => '/var/lib/puppet/concat',
         :fqdn                   => 'some.host.tld',
-        :processorcount         => 2 })
+      })
     end
 
     let :platform_params do
@@ -175,7 +175,7 @@ describe 'ceilometer::api' do
         :operatingsystemmajrelease => '7',
         :fqdn                   => 'some.host.tld',
         :concat_basedir         => '/var/lib/puppet/concat',
-        :processorcount         => 2 })
+      })
     end
 
     let :platform_params do

diff --git a/spec/classes/ceilometer_db_postgresql_spec.rb b/spec/classes/ceilometer_db_postgresql_spec.rb
index 22c2e303b69d321500aad561bee19a88afad6995..3420affbc3fd82ed488ea7359303df258ee0c242 100644 (file)
--- a/spec/classes/ceilometer_db_postgresql_spec.rb
+++ b/spec/classes/ceilometer_db_postgresql_spec.rb
@@ -30,7 +30,6 @@ describe 'ceilometer::db::postgresql' do
     context "on #{os}" do
       let (:facts) do
         facts.merge(OSDefaults.get_facts({
-          :processorcount => 8,
           :concat_basedir => '/var/lib/puppet/concat'
         }))
       end

diff --git a/spec/classes/ceilometer_db_sync_spec.rb b/spec/classes/ceilometer_db_sync_spec.rb
index d679ebdc3c69d2f53441df8e4c0a8dbc47084559..db598d81d9854c0553c1eff650b6da4953c0c9ee 100644 (file)
--- a/spec/classes/ceilometer_db_sync_spec.rb
+++ b/spec/classes/ceilometer_db_sync_spec.rb
@@ -39,7 +39,6 @@ describe 'ceilometer::db::sync' do
     context "on #{os}" do
       let (:facts) do
         facts.merge(OSDefaults.get_facts({
-          :processorcount => 8,
           :concat_basedir => '/var/lib/puppet/concat'
         }))
       end

diff --git a/spec/classes/ceilometer_wsgi_apache_spec.rb b/spec/classes/ceilometer_wsgi_apache_spec.rb
index 4b7201c965c99bfa90a611d33f90d4d6033ff4be..64908b5652e0eb417ab016e1cd800791bc7b1bb5 100644 (file)
--- a/spec/classes/ceilometer_wsgi_apache_spec.rb
+++ b/spec/classes/ceilometer_wsgi_apache_spec.rb
@@ -4,7 +4,7 @@ describe 'ceilometer::wsgi::apache' do
 
   let :global_facts do
     {
-      :processorcount => 42,
+      :os_workers => 8,
       :concat_basedir => '/var/lib/puppet/concat',
       :fqdn           => 'some.host.tld'
     }