commit c5cf036d9a40333a7f202d4c2f72074f1651d534 Author: Luke Short Date: Thu Sep 10 15:58:11 2020 -0400 Adjust Ansible forks caculations Using a multiple of 10 can be excessive on resource usage. It has now been lowered to 4. The default maximum will also no longer exceed 100. Change-Id: I57345d5b100efce143fa940b56c81f5e6bc6c390 Signed-off-by: Luke Short (cherry picked from commit 9e9948e7edc011bcf69b240543f383c7754bb2d8) diff --git a/tripleo_common/actions/ansible.py b/tripleo_common/actions/ansible.py index 3a65307..34f5989 100644 --- a/tripleo_common/actions/ansible.py +++ b/tripleo_common/actions/ansible.py @@ -102,7 +102,8 @@ def write_default_ansible_cfg(work_dir, datetime.now().strftime("%Y-%m-%dT%H:%M:%S")) os.rename(log_path, new_path) - config.set('defaults', 'forks', str(multiprocessing.cpu_count() * 10)) + config.set('defaults', 'forks', str(min( + multiprocessing.cpu_count() * 4, 100))) config.set('defaults', 'timeout', '30') config.set('defaults', 'gather_timeout', '30') diff --git a/tripleo_common/tests/actions/test_ansible.py b/tripleo_common/tests/actions/test_ansible.py index ddaf518..1506381 100644 --- a/tripleo_common/tests/actions/test_ansible.py +++ b/tripleo_common/tests/actions/test_ansible.py @@ -385,4 +385,4 @@ class CopyConfigFileTest(base.TestCase): ansible_cfg = configparser.ConfigParser() ansible_cfg.read(resulting_ansible_config) - self.assertEqual('40', ansible_cfg.get('defaults', 'forks')) + self.assertEqual('16', ansible_cfg.get('defaults', 'forks'))