From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 186E326A0EB for ; Wed, 9 Apr 2025 14:43:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744209823; cv=none; b=LOj3iPV/aoZHJSWYitA5t2/5JYXJPibY7GihS03f/TNXKT1cEHqrRsQLFIPvMxMrxFP0lH0/3ZeWrhp6Xppi8CRHE1OlkMpaVefnGJ2nVpY1v3BEqbWEVFB64xamkjeJE5Thd1M0ZbqrG2mRdqkP0cxodjPCO65yMst+eePYrbQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744209823; c=relaxed/simple; bh=0AuQAnt2RcfDHY9sbUGEEeiZeG3K2kjMVWQi24Gbggc=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=q95RaJTNTAXTkOJkN4q13kymh9i09YbkjdKA4uts3WCRzbdHyTIv7Hglg31ecmN5ne61nrG88n6yLQaKvaGQ76uhKqe+N/J6hSr1jfSp/jmvHvvyLTCMI5a8wHkWyiHIqrL5i6VGb9qpLWfcgXHoaGGQm/Tv5RCc6bUIzRCDKpA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=vFl/1PGE; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="vFl/1PGE" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0705BC4CEE7; Wed, 9 Apr 2025 14:43:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1744209821; bh=0AuQAnt2RcfDHY9sbUGEEeiZeG3K2kjMVWQi24Gbggc=; h=From:To:Cc:Subject:Date:From; b=vFl/1PGEQPFoUUdVQ2kf/VslVIWjbr88HwdIxLAgA/XgNr+c0ipIKaBb4wgx3MYfI 5VqrnrlCc3GV0oOyDnENa4uziFbaxpxJweJDFStLSrVG/e/7JgZQsqqdQi33s3SfUv iZ9vicaNJMZ7j2KZhFV4RzeGiCAMA8w7BLGyPYN318MKC8QikWJrLUpQr3JCPs3lyw L6EOzX1sK40+Vk25lUupH3bPREtcvjE2t7V91SektT59BmXpywaYCQu5l8iHwWIEXt ZRPVwtivXeyEz2oMSlLwOnuzISDZHHcfiVGuhuB7aVQWhn/NfUIG5GdRxU4ywgi+YN TJuxRBrEpnrhQ== From: cel@kernel.org To: Cc: Chuck Lever , Luis Chamberlain Subject: [PATCH v2] ansible: Increase default task parallelism Date: Wed, 9 Apr 2025 10:43:39 -0400 Message-ID: <20250409144339.888605-1-cel@kernel.org> X-Mailer: git-send-email 2.49.0 Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Chuck Lever Enable the workflows with more than 5 target nodes to run with full concurrency. Reviewed-by: Luis Chamberlain Signed-off-by: Chuck Lever --- kconfigs/Kconfig.ansible_cfg | 35 +++++++++++++++++++ playbooks/roles/ansible_cfg/defaults/main.yml | 1 + .../ansible_cfg/templates/ansible.cfg.j2 | 1 + 3 files changed, 37 insertions(+) diff --git a/kconfigs/Kconfig.ansible_cfg b/kconfigs/Kconfig.ansible_cfg index 7286b0fe5025..d81a574ba239 100644 --- a/kconfigs/Kconfig.ansible_cfg +++ b/kconfigs/Kconfig.ansible_cfg @@ -2,6 +2,10 @@ config ANSIBLE_CFG_CALLBACK_PLUGIN_SET_BY_CLI bool default $(shell, scripts/check-cli-set-var.sh ANSIBLE_CFG_CALLBACK_PLUGIN) +config ANSIBLE_CFG_FORKS_SET_BY_CLI + bool + default $(shell, scripts/check-cli-set-var.sh ANSIBLE_CFG_FORKS) + menu "Ansible Callback Plugin Configuration" choice prompt "Ansible Callback Plugin" @@ -108,6 +112,37 @@ config ANSIBLE_CFG_DEPRECATION_WARNINGS Toggle to control the showing of deprecation warnings https://docs.ansible.com/ansible/latest/reference_appendices/config.html#deprecation-warnings +config ANSIBLE_CFG_FORKS_CUSTOM + bool "Enable a custom Ansible forks setting" + default n + help + When this setting is enabled, specify the maximum number + of concurrent Ansible tasks (forks) via Kconfig. When this + setting is disabled, kdevops chooses a default value that + can be overridden with "ANSIBLE_CFG_FORKS=NN" on the + "make" command line. + +if ANSIBLE_CFG_FORKS_CUSTOM + +config ANSIBLE_CFG_FORKS + int "forks" + output yaml + help + Set the maximum number of concurrent Ansible tasks (forks). + https://docs.ansible.com/ansible/latest/playbook_guide/playbooks_strategies.html#setting-the-number-of-forks + +endif # ANSIBLE_CFG_FORKS_CUSTOM + +if !ANSIBLE_CFG_FORKS_CUSTOM + +config ANSIBLE_CFG_FORKS + int + output yaml + default 10 if !ANSIBLE_CFG_FORKS_SET_BY_CLI + default $(shell, ./scripts/append-makefile-vars-int.sh $(ANSIBLE_CFG_FORKS)) if ANSIBLE_CFG_FORKS_SET_BY_CLI + +endif # !ANSIBLE_CFG_FORKS_CUSTOM + if DISTRO_OPENSUSE config ANSIBLE_CFG_RECONNECTION_RETRIES diff --git a/playbooks/roles/ansible_cfg/defaults/main.yml b/playbooks/roles/ansible_cfg/defaults/main.yml index c98334aa8f81..42a9e58f0658 100644 --- a/playbooks/roles/ansible_cfg/defaults/main.yml +++ b/playbooks/roles/ansible_cfg/defaults/main.yml @@ -8,3 +8,4 @@ ansible_cfg_callback_plugin_display_skipped_hosts: true ansible_cfg_callback_plugin_show_custom_stats: false ansible_cfg_callback_plugin_show_per_host_start: true ansible_cfg_callback_plugin_show_task_path_on_failure: true +ansible_cfg_forks: 10 diff --git a/playbooks/roles/ansible_cfg/templates/ansible.cfg.j2 b/playbooks/roles/ansible_cfg/templates/ansible.cfg.j2 index e13931b5ce97..04ae67782c20 100644 --- a/playbooks/roles/ansible_cfg/templates/ansible.cfg.j2 +++ b/playbooks/roles/ansible_cfg/templates/ansible.cfg.j2 @@ -8,6 +8,7 @@ display_skipped_hosts = {{ ansible_cfg_callback_plugin_display_skipped_hosts }} show_custom_stats = {{ ansible_cfg_callback_plugin_show_custom_stats }} show_per_host_start = {{ ansible_cfg_callback_plugin_show_per_host_start }} show_task_path_on_failure = {{ ansible_cfg_callback_plugin_show_task_path_on_failure }} +forks = {{ ansible_cfg_forks }} {% if ansible_facts['distribution'] == 'openSUSE' %} [connection] retries = {{ ansible_cfg_reconnection_retries }} -- 2.49.0