From 8d0f92c2768bd3eda050ee4a4d873c6e356fca82 Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Sun, 26 Apr 2020 21:26:28 +0200 Subject: [PATCH] Increase Thread stack size MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit It sets Glibc default value. https://wiki.musl-libc.org/functional-differences-from-glibc.html https://bugs.python.org/issue32307 Change-Id: I647569354b3a30f7de4116cab53c9e2aeff91a59 Signed-off-by: Cédric Ollivier --- docker/benchmarking/Dockerfile | 1 + docker/core/Dockerfile | 5 +- docker/core/Increase-Thread-stack-size.patch | 85 ++++++++++++++++++++++++++++ docker/healthcheck/Dockerfile | 1 + docker/smoke/Dockerfile | 1 + docker/vnf/Dockerfile | 1 + upper-constraints.txt | 2 +- 7 files changed, 94 insertions(+), 2 deletions(-) create mode 100644 docker/core/Increase-Thread-stack-size.patch diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile index 715aab1a5..c85ddf643 100644 --- a/docker/benchmarking/Dockerfile +++ b/docker/benchmarking/Dockerfile @@ -14,6 +14,7 @@ RUN apk --no-cache add --update libxml2 libxslt && \ case $(uname -m) in aarch*|arm*) sed -i -E /^PyNaCl=/d upper-constraints.txt ;; esac && \ wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH > upper-constraints.opnfv.txt && \ sed -i -E /#egg=functest/d upper-constraints.opnfv.txt && \ + sed -i -E /#egg=rally/d upper-constraints.opnfv.txt && \ case $(uname -m) in aarch*|arm*) CFLAGS="-O0" pip3 install --no-cache-dir -cupper-constraints.txt -cupper-constraints.opnfv.txt lxml ;; esac && \ git init /src/vmtp && \ (cd /src/vmtp && \ diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index db223f3b8..e814ca5f9 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -3,6 +3,7 @@ FROM alpine:3.11 ARG BRANCH=master ARG OPENSTACK_TAG=master +COPY Increase-Thread-stack-size.patch /tmp/Increase-Thread-stack-size.patch RUN apk --no-cache add --update \ python3 libffi openssl libjpeg-turbo py3-pip bash \ grep sed wget ca-certificates git openssh-client qemu-img iputils coreutils mailcap libstdc++ && \ @@ -23,7 +24,9 @@ RUN apk --no-cache add --update \ update-requirements -s --source /src/openstack-requirements /src/functest && \ pip3 install --no-cache-dir --src /src -cupper-constraints.opnfv.txt -cupper-constraints.txt \ /src/functest && \ - rm -r upper-constraints.txt upper-constraints.opnfv.txt /src/functest && \ + (cd /src/rally && patch -p1 < /tmp/Increase-Thread-stack-size.patch) && \ + rm -r upper-constraints.txt upper-constraints.opnfv.txt /src/functest \ + /tmp/Increase-Thread-stack-size.patch && \ cp /usr/lib/python3.8/site-packages/functest/ci/logging.ini /usr/lib/python3.8/site-packages/xtesting/ci/ && \ cp /usr/lib/python3.8/site-packages/functest/ci/logging.debug.ini /usr/lib/python3.8/site-packages/xtesting/ci/ && \ bash -c "mkdir -p /var/lib/xtesting /home/opnfv" && \ diff --git a/docker/core/Increase-Thread-stack-size.patch b/docker/core/Increase-Thread-stack-size.patch new file mode 100644 index 000000000..92ca225fa --- /dev/null +++ b/docker/core/Increase-Thread-stack-size.patch @@ -0,0 +1,85 @@ +From ffebbd89ca6c02312bc669e6d0d6295aae5b0319 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?C=C3=A9dric=20Ollivier?= +Date: Sun, 26 Apr 2020 20:42:27 +0200 +Subject: [PATCH] Increase Thread stack size +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +It sets Glibc default value. +https://wiki.musl-libc.org/functional-differences-from-glibc.html +https://bugs.python.org/issue32307 + +Change-Id: I0158ec40fda63ab11fb8d50ac43610dac6c455c7 +Signed-off-by: Cédric Ollivier +--- + rally/common/broker.py | 1 + + rally/plugins/task/runners/constant.py | 1 + + rally/plugins/task/runners/rps.py | 1 + + rally/task/engine.py | 1 + + rally/task/hook.py | 1 + + 5 files changed, 5 insertions(+) + +diff --git a/rally/common/broker.py b/rally/common/broker.py +index 2e0bd75e2..cb169ab3e 100644 +--- a/rally/common/broker.py ++++ b/rally/common/broker.py +@@ -15,6 +15,7 @@ + + import collections + import threading ++threading.stack_size(8*1024*1024) + + from rally.common import logging + +diff --git a/rally/plugins/task/runners/constant.py b/rally/plugins/task/runners/constant.py +index 5feb1fee1..5300324f3 100644 +--- a/rally/plugins/task/runners/constant.py ++++ b/rally/plugins/task/runners/constant.py +@@ -17,6 +17,7 @@ import collections + import multiprocessing + import queue as Queue + import threading ++threading.stack_size(8*1024*1024) + import time + + from rally.common import utils +diff --git a/rally/plugins/task/runners/rps.py b/rally/plugins/task/runners/rps.py +index 98a706d11..defeedc1c 100644 +--- a/rally/plugins/task/runners/rps.py ++++ b/rally/plugins/task/runners/rps.py +@@ -17,6 +17,7 @@ import collections + import multiprocessing + import queue as Queue + import threading ++threading.stack_size(8*1024*1024) + import time + + from rally.common import logging +diff --git a/rally/task/engine.py b/rally/task/engine.py +index 594d7f464..71f7f01c5 100644 +--- a/rally/task/engine.py ++++ b/rally/task/engine.py +@@ -16,6 +16,7 @@ + import copy + import json + import threading ++threading.stack_size(8*1024*1024) + import time + import traceback + +diff --git a/rally/task/hook.py b/rally/task/hook.py +index 524bc3b71..1f731abea 100644 +--- a/rally/task/hook.py ++++ b/rally/task/hook.py +@@ -16,6 +16,7 @@ + import abc + import collections + import threading ++threading.stack_size(8*1024*1024) + + from rally.common import logging + from rally.common.plugin import plugin +-- +2.26.2 + diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile index 885d501b2..62c8e6138 100644 --- a/docker/healthcheck/Dockerfile +++ b/docker/healthcheck/Dockerfile @@ -13,6 +13,7 @@ RUN apk --no-cache add --virtual .build-deps --update \ case $(uname -m) in aarch*|arm*) sed -i -E /^PyNaCl=/d upper-constraints.txt ;; esac && \ wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH > upper-constraints.opnfv.txt && \ sed -i -E /#egg=functest/d upper-constraints.opnfv.txt && \ + sed -i -E /#egg=rally/d upper-constraints.opnfv.txt && \ git init /src/tempest-horizon && \ (cd /src/tempest-horizon && \ git fetch --tags https://opendev.org/openstack/tempest-horizon.git $TEMPEST_HORIZON_TAG && \ diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index c49cb5518..00b05d19e 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -21,6 +21,7 @@ RUN apk --no-cache add --update libxml2 libxslt && \ case $(uname -m) in aarch*|arm*) sed -i -E /^PyNaCl=/d upper-constraints.txt ;; esac && \ wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH > upper-constraints.opnfv.txt && \ sed -i -E /#egg=functest/d upper-constraints.opnfv.txt && \ + sed -i -E /#egg=rally/d upper-constraints.opnfv.txt && \ case $(uname -m) in aarch*|arm*) CFLAGS="-O0" pip3 install --no-cache-dir -cupper-constraints.txt -cupper-constraints.opnfv.txt lxml ;; esac && \ git init /src/patrole && \ (cd /src/patrole && \ diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile index b59a97574..38ca42d21 100644 --- a/docker/vnf/Dockerfile +++ b/docker/vnf/Dockerfile @@ -28,6 +28,7 @@ RUN apk --no-cache add --update \ case $(uname -m) in aarch*|arm*) sed -i -E /^PyNaCl=/d upper-constraints.txt ;; esac && \ wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH > upper-constraints.opnfv.txt && \ sed -i -E /#egg=functest/d upper-constraints.opnfv.txt && \ + sed -i -E /#egg=rally/d upper-constraints.opnfv.txt && \ git clone --depth 1 -b $VIMS_TEST_TAG https://github.com/Metaswitch/clearwater-live-test /src/vims-test && \ sed -i s/unf_ext\ \(.*\)/unf_ext\ \(0.0.7.4\)/g /src/vims-test/Gemfile.lock && \ git init /src/vims-test/quaff && \ diff --git a/upper-constraints.txt b/upper-constraints.txt index b5876feb4..8772bab54 100644 --- a/upper-constraints.txt +++ b/upper-constraints.txt @@ -20,7 +20,7 @@ git+https://github.com/PyCQA/bandit@3d0824676974e7e2e9635c10bc4f12e261f1dbdf#egg bandit===1.1.0 ruamel.yaml.jinja2==0.2.2 -e git+https://opendev.org/openstack/tempest#egg=tempest -git+https://opendev.org/openstack/rally.git#egg=rally +-e git+https://opendev.org/openstack/rally.git#egg=rally git+https://opendev.org/openstack/rally-openstack.git#egg=rally-openstack git+https://github.com/xrally/xrally-kubernetes.git#egg=xrally-kubernetes pylint===1.9.5;python_version=='2.7' -- 2.16.6