CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## [3.1.0](https://github.com/theforeman/puppet-pulpcore/tree/3.1.0) (2021-02-09)
+
+[Full Changelog](https://github.com/theforeman/puppet-pulpcore/compare/3.0.0...3.1.0)
+
+**Implemented enhancements:**
+
+- Fixes [\#31835](https://projects.theforeman.org/issues/31835): Add disablereuse=on for pulpcore-content service [\#171](https://github.com/theforeman/puppet-pulpcore/pull/171) ([ehelms](https://github.com/ehelms))
+- Fixes [\#31815](https://projects.theforeman.org/issues/31815) - Allow setting number of workers for content app [\#170](https://github.com/theforeman/puppet-pulpcore/pull/170) ([ehelms](https://github.com/ehelms))
+
 ## [3.0.0](https://github.com/theforeman/puppet-pulpcore/tree/3.0.0) (2021-01-28)
 
 [Full Changelog](https://github.com/theforeman/puppet-pulpcore/compare/2.2.2...3.0.0)

manifests/apache.pp

@@ -7,7 +7,7 @@
   Hash[String, Any] $http_vhost_options = {},
   Hash[String, Any] $https_vhost_options = {},
   Enum['none', 'optional', 'require', 'optional_no_ca'] $ssl_verify_client = 'optional',
-  Hash $content_proxy_params = {'timeout' => '600'},
+  Hash $content_proxy_params = {'timeout' => '600', 'disablereuse' => 'on'},
   Hash $api_proxy_params = {'timeout' => '600'},
 ) {
   include pulpcore

manifests/init.pp

@@ -135,6 +135,14 @@
 # @param service_ensure
 #   Specify if Pulp services should be running or stopped.
 #
+# @param content_service_worker_count
+#   Number of pulpcore-content service workers for gunicorn to use.
+#   Modifying this parameter should be done incrementally with benchmarking at each step to determine an optimal value for your deployment.
+#
+# @param api_service_worker_count
+#   Number of pulpcore-api service workers for gunicorn to use.
+#   Modifying this parameter should be done incrementally with benchmarking at each step to determine an optimal value for your deployment.
+#
 # @example Default configuration
 #   include pulpcore
 #
@@ -178,6 +186,8 @@
   Integer[0] $worker_count = min(8, $facts['processors']['count']),
   Boolean $service_enable = true,
   Boolean $service_ensure = true,
+  Integer[0] $content_service_worker_count = (2*min(8, $facts['processors']['count']) + 1),
+  Integer[0] $api_service_worker_count = 1,
 ) {
   $settings_file = "${config_dir}/settings.py"
 

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "theforeman-pulpcore",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "author": "theforeman",
   "summary": "Installs next generation Pulp server",
   "license": "GPL-3.0-or-later",

spec/classes/plugin_deb_spec.rb

@@ -34,7 +34,7 @@
   <Location "/pulp/deb">
     RequestHeader unset X-CLIENT-CERT
     RequestHeader set X-CLIENT-CERT "%{SSL_CLIENT_CERT}s" env=SSL_CLIENT_CERT
-    ProxyPass unix:///run/pulpcore-content.sock|http://pulpcore-content/pulp/content timeout=600
+    ProxyPass unix:///run/pulpcore-content.sock|http://pulpcore-content/pulp/content disablereuse=on timeout=600
     ProxyPassReverse unix:///run/pulpcore-content.sock|http://pulpcore-content/pulp/content
   </Location>
 CONTENT
@@ -46,7 +46,7 @@
   <Location "/pulp/deb">
     RequestHeader unset X-CLIENT-CERT
     RequestHeader set X-CLIENT-CERT "%{SSL_CLIENT_CERT}s" env=SSL_CLIENT_CERT
-    ProxyPass unix:///run/pulpcore-content.sock|http://pulpcore-content/pulp/content timeout=600
+    ProxyPass unix:///run/pulpcore-content.sock|http://pulpcore-content/pulp/content disablereuse=on timeout=600
     ProxyPassReverse unix:///run/pulpcore-content.sock|http://pulpcore-content/pulp/content
   </Location>
 CONTENT

spec/classes/plugin_file_spec.rb

@@ -32,7 +32,7 @@
   <Location "/pulp/isos">
     RequestHeader unset X-CLIENT-CERT
     RequestHeader set X-CLIENT-CERT "%{SSL_CLIENT_CERT}s" env=SSL_CLIENT_CERT
-    ProxyPass unix:///run/pulpcore-content.sock|http://pulpcore-content/pulp/content timeout=600
+    ProxyPass unix:///run/pulpcore-content.sock|http://pulpcore-content/pulp/content disablereuse=on timeout=600
     ProxyPassReverse unix:///run/pulpcore-content.sock|http://pulpcore-content/pulp/content
   </Location>
 CONTENT
@@ -44,7 +44,7 @@
   <Location "/pulp/isos">
     RequestHeader unset X-CLIENT-CERT
     RequestHeader set X-CLIENT-CERT "%{SSL_CLIENT_CERT}s" env=SSL_CLIENT_CERT
-    ProxyPass unix:///run/pulpcore-content.sock|http://pulpcore-content/pulp/content timeout=600
+    ProxyPass unix:///run/pulpcore-content.sock|http://pulpcore-content/pulp/content disablereuse=on timeout=600
     ProxyPassReverse unix:///run/pulpcore-content.sock|http://pulpcore-content/pulp/content
   </Location>
 CONTENT

spec/classes/plugin_rpm_spec.rb

@@ -34,7 +34,7 @@
   <Location "/pulp/repos">
     RequestHeader unset X-CLIENT-CERT
     RequestHeader set X-CLIENT-CERT "%{SSL_CLIENT_CERT}s" env=SSL_CLIENT_CERT
-    ProxyPass unix:///run/pulpcore-content.sock|http://pulpcore-content/pulp/content timeout=600
+    ProxyPass unix:///run/pulpcore-content.sock|http://pulpcore-content/pulp/content disablereuse=on timeout=600
     ProxyPassReverse unix:///run/pulpcore-content.sock|http://pulpcore-content/pulp/content
   </Location>
 CONTENT
@@ -46,7 +46,7 @@
   <Location "/pulp/repos">
     RequestHeader unset X-CLIENT-CERT
     RequestHeader set X-CLIENT-CERT "%{SSL_CLIENT_CERT}s" env=SSL_CLIENT_CERT
-    ProxyPass unix:///run/pulpcore-content.sock|http://pulpcore-content/pulp/content timeout=600
+    ProxyPass unix:///run/pulpcore-content.sock|http://pulpcore-content/pulp/content disablereuse=on timeout=600
     ProxyPassReverse unix:///run/pulpcore-content.sock|http://pulpcore-content/pulp/content
   </Location>
 CONTENT

spec/classes/pulpcore_spec.rb

@@ -65,7 +65,7 @@
                 'provider'        => 'location',
                 'proxy_pass'      => [{
                   'url'    => 'unix:///run/pulpcore-content.sock|http://pulpcore-content/pulp/content',
-                  'params' => {'timeout' => '600'},
+                  'params' => {'timeout' => '600', 'disablereuse' => 'on'},
                 }],
                 'request_headers' => [
                   'unset X-CLIENT-CERT',
@@ -86,7 +86,7 @@
                 'provider'        => 'location',
                 'proxy_pass'      => [{
                   'url'    => 'unix:///run/pulpcore-content.sock|http://pulpcore-content/pulp/content',
-                  'params' => {'timeout' => '600'},
+                  'params' => {'timeout' => '600', 'disablereuse' => 'on'},
                 }],
                 'request_headers' => [
                   'unset X-CLIENT-CERT',
@@ -278,7 +278,7 @@
   <Location "/pulp/content">
     RequestHeader unset X-CLIENT-CERT
     RequestHeader set X-CLIENT-CERT "%{SSL_CLIENT_CERT}s" env=SSL_CLIENT_CERT
-    ProxyPass unix:///run/pulpcore-content.sock|http://pulpcore-content/pulp/content timeout=600
+    ProxyPass unix:///run/pulpcore-content.sock|http://pulpcore-content/pulp/content disablereuse=on timeout=600
     ProxyPassReverse unix:///run/pulpcore-content.sock|http://pulpcore-content/pulp/content
   </Location>
 CONTENT
@@ -295,7 +295,7 @@
   <Location "/pulp/content">
     RequestHeader unset X-CLIENT-CERT
     RequestHeader set X-CLIENT-CERT "%{SSL_CLIENT_CERT}s" env=SSL_CLIENT_CERT
-    ProxyPass unix:///run/pulpcore-content.sock|http://pulpcore-content/pulp/content timeout=600
+    ProxyPass unix:///run/pulpcore-content.sock|http://pulpcore-content/pulp/content disablereuse=on timeout=600
     ProxyPassReverse unix:///run/pulpcore-content.sock|http://pulpcore-content/pulp/content
   </Location>
 

templates/pulpcore-api.service.erb

@@ -12,6 +12,7 @@ Group=<%= scope['pulpcore::group'] %>
 WorkingDirectory=<%= scope['pulpcore::user_home'] %>
 RuntimeDirectory=pulpcore-api
 ExecStart=/usr/libexec/pulpcore/gunicorn pulpcore.app.wsgi:application \
+          -w <%= scope['pulpcore::api_service_worker_count'] %> \
           --access-logfile -
 ExecReload=/bin/kill -s HUP $MAINPID
 ProtectSystem=full

templates/pulpcore-content.service.erb

@@ -13,7 +13,7 @@ WorkingDirectory=<%= scope['pulpcore::user_home'] %>
 RuntimeDirectory=pulpcore-content
 ExecStart=/usr/libexec/pulpcore/gunicorn pulpcore.content:server \
           --worker-class 'aiohttp.GunicornWebWorker' \
-          -w 2 \
+          -w <%= scope['pulpcore::content_service_worker_count'] %> \
           --access-logfile -
 ExecReload=/bin/kill -s HUP $MAINPID
 SyslogIdentifier=pulpcore-content