aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2020-06-01 10:25:00 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2020-06-01 10:48:11 +0200
commit6c7ec88dac1aaaae9abb5dcad3b8779fce951e50 (patch)
tree04d6caff80dceea2181397eab86397cee5fdfc5e /docker
parent437fa34bfb743396e0140ed8a0fe3fca69ab8e9e (diff)
Switch to fork in Python multiprocessing (python2 default)
Change-Id: Id93da8c0fc710e1491adeb2b42e6da99974a0580 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 0d1e55eae02469db59bb880842d08baf930bd5aa)
Diffstat (limited to 'docker')
-rw-r--r--docker/core/Try-to-detect-the-race-conditions.patch13
1 files changed, 8 insertions, 5 deletions
diff --git a/docker/core/Try-to-detect-the-race-conditions.patch b/docker/core/Try-to-detect-the-race-conditions.patch
index 6eed7f9f3..50d034418 100644
--- a/docker/core/Try-to-detect-the-race-conditions.patch
+++ b/docker/core/Try-to-detect-the-race-conditions.patch
@@ -1,4 +1,4 @@
-From b7a04b5993c232f4357a213517ed798cb15f3c25 Mon Sep 17 00:00:00 2001
+From 92cf158d8932f4509983b3813049be717093253e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Ollivier?= <cedric.ollivier@orange.com>
Date: Thu, 30 Apr 2020 13:59:24 +0200
Subject: [PATCH] Try to detect the race conditions
@@ -9,25 +9,28 @@ Content-Transfer-Encoding: 8bit
Change-Id: I9b468ec1cf79e0a66abeb1fb48f5f0f067c2c198
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
- rally/cli/main.py | 3 ++
+ rally/cli/main.py | 6 ++++
rally/plugins/task/runners/constant.py | 30 ++++++++++++++++++-
.../task/scenarios/requests/http_requests.py | 9 ++++++
.../plugins/task/scenarios/requests/utils.py | 9 ++++++
rally/task/runner.py | 27 +++++++++++++++--
rally/task/utils.py | 15 ++++++++++
- 6 files changed, 90 insertions(+), 3 deletions(-)
+ 6 files changed, 93 insertions(+), 3 deletions(-)
diff --git a/rally/cli/main.py b/rally/cli/main.py
-index 235a57113..bcc41cb01 100644
+index 235a57113..d931924d8 100644
--- a/rally/cli/main.py
+++ b/rally/cli/main.py
-@@ -15,6 +15,9 @@
+@@ -15,6 +15,12 @@
"""CLI interface for Rally."""
+import threading
+threading.stack_size(1024 * 1024)
+
++import multiprocessing as mp
++mp.set_start_method('fork')
++
import sys
from rally.cli import cliutils