From 51f5519f11ba212e9d9c68ca51929db2b405ab77 Mon Sep 17 00:00:00 2001
From: Maksym Yatsenko <maxy.1982@gmail.com>
Date: Mon, 10 Oct 2016 16:57:46 +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: I6b994becf8963020a56902785e2c569553c95a14
---
 manifests/wsgi/apache.pp                                     | 4 ++--
 .../notes/os_workers_for_worker_count-05563e8178495993.yaml  | 5 +++++
 spec/classes/ceilometer_api_spec.rb                          | 4 ++--
 spec/classes/ceilometer_db_postgresql_spec.rb                | 1 -
 spec/classes/ceilometer_db_sync_spec.rb                      | 1 -
 spec/classes/ceilometer_wsgi_apache_spec.rb                  | 2 +-
 6 files changed, 10 insertions(+), 7 deletions(-)
 create mode 100644 releasenotes/notes/os_workers_for_worker_count-05563e8178495993.yaml

diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp
index e6e0c638..a87458f7 100644
--- 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
index 00000000..5616f0d7
--- /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 0739743f..e0ccda56 100644
--- 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 22c2e303..3420affb 100644
--- 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 d679ebdc..db598d81 100644
--- 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 4b7201c9..64908b56 100644
--- 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'
     }