From c67c8f98f315308fd413ccd46d0b1f94b9d87746 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Sun, 26 Jan 2014 20:57:02 -0500 Subject: [PATCH] Set concurrency to num CPUs / 2 A recent change added a knob for setting the concurrency for tempest runs. It started out at 4 and then was reduced to 2. Both of these values assumed that all of our test nodes had 4 CPUs. That's not actually the case. We now have some nodes with 8. Change the default from 2 to the number of CPUs / 2. This won't change anything on most of our test nodes, but it will allow us to use more on some nodes. Change-Id: I559359b44dcbb717de3eab31cb296f033951f312 --- devstack-vm-gate-wrap.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh index cff02d6a..ce57042a 100755 --- a/devstack-vm-gate-wrap.sh +++ b/devstack-vm-gate-wrap.sh @@ -152,7 +152,11 @@ export DEVSTACK_GATE_SAVANNA=${DEVSTACK_GATE_SAVANNA:-0} export DEVSTACK_GATE_CONFIGDRIVE=${DEVSTACK_GATE_CONFIGDRIVE:-1} # Set the number of threads to run tempest with -export TEMPEST_CONCURRENCY=${TEMPEST_CONCURRENCY:-2} +DEFAULT_CONCURRENCY=$(nproc) +if [ ${DEFAULT_CONCURRENCY} > 3 ] ; then + DEFAULT_CONCURRENCY=$[${DEFAULT_CONCURRENCY} / 2] +fi +export TEMPEST_CONCURRENCY=${TEMPEST_CONCURRENCY:-${DEFAULT_CONCURRENCY}} # The following variables are set for different directions of Grenade updating # for a stable branch we want to both try to upgrade forward n => n+1 as