From 75329832b7e140a247b382182674d036db7423cf Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Mon, 19 Nov 2018 13:32:13 -0500 Subject: [PATCH] Fixes #25511 - Disable max tasks by default to prevent memory issues. --- manifests/params.pp | 3 ++- spec/classes/katello_pulp_spec.rb | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index 33bbb165..c32d0ded 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -29,8 +29,9 @@ $proxy_username = undef $proxy_password = undef + # Pulp worker settings $num_pulp_workers = min($::processorcount, 8) - $max_tasks_per_pulp_worker = 2 + $max_tasks_per_pulp_worker = undef # Pulp max speed setting $pulp_max_speed = undef diff --git a/spec/classes/katello_pulp_spec.rb b/spec/classes/katello_pulp_spec.rb index 577876ae..81c73e57 100644 --- a/spec/classes/katello_pulp_spec.rb +++ b/spec/classes/katello_pulp_spec.rb @@ -44,7 +44,7 @@ class { '::katello': .with_enable_docker(true) .with_enable_ostree(false) .with_num_workers(1) - .with_max_tasks_per_child(2) + .with_max_tasks_per_child(nil) .with_enable_parent_node(false) .with_repo_auth(true) .with_puppet_wsgi_processes(1) @@ -80,7 +80,8 @@ class { '::katello': pulp_db_name => 'pulp_db', pulp_db_username => 'pulp_user', pulp_db_password => 'pulp_pw', - pulp_db_seeds => '192.168.1.1:27017' + pulp_db_seeds => '192.168.1.1:27017', + max_tasks_per_pulp_worker => 2 } EOS end @@ -91,6 +92,7 @@ class { '::katello': .with_db_username('pulp_user') .with_db_password('pulp_pw') .with_db_seeds('192.168.1.1:27017') + .with_max_tasks_per_child(2) end end end