aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2020-11-11 16:39:04 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2020-11-11 16:39:04 +0100
commit6c0a169e86af8336ba4204cecae9c4f8a9578453 (patch)
tree73b9a8ac36133ecd63a5e756f07e58a6eba422e6
parentf9ba6ad960da1356dcdecf4f02158799b54375ec (diff)
Update Rally patch
It conforms with the new Rally contraints. Change-Id: If2d4910cd69bbec587097e029e4530682fe48938 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--docker/core/Switch-to-threading.Thread-for-Rally-tasks.patch9
1 files changed, 5 insertions, 4 deletions
diff --git a/docker/core/Switch-to-threading.Thread-for-Rally-tasks.patch b/docker/core/Switch-to-threading.Thread-for-Rally-tasks.patch
index a6d01273..7c146c9e 100644
--- a/docker/core/Switch-to-threading.Thread-for-Rally-tasks.patch
+++ b/docker/core/Switch-to-threading.Thread-for-Rally-tasks.patch
@@ -1,4 +1,4 @@
-From 0d0ca00e56024a9919c150dbed62050d4c70b0c8 Mon Sep 17 00:00:00 2001
+From 7223c6c766d2cbd47c54048426c904a27b52e069 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Ollivier?= <cedric.ollivier@orange.com>
Date: Wed, 3 Jun 2020 15:23:59 +0200
Subject: [PATCH] Switch to threading.Thread() for Rally tasks
@@ -15,12 +15,13 @@ It looks similar to gsutil release notes [2].
Change-Id: I582933832e23d188c7fa5999e713dd5d7e82d2da
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
+(cherry picked from commit 9b07423c246e7e4ab9fa25851d79ce6986c10c2e)
---
rally/task/runner.py | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/rally/task/runner.py b/rally/task/runner.py
-index 3397e1193..5edebb406 100644
+index 55372e509..0f0245588 100644
--- a/rally/task/runner.py
+++ b/rally/task/runner.py
@@ -17,6 +17,7 @@ import abc
@@ -30,8 +31,8 @@ index 3397e1193..5edebb406 100644
+import threading
import time
- from rally.common import logging
-@@ -186,9 +187,9 @@ class ScenarioRunner(plugin.Plugin, validation.ValidatablePluginMixin,
+ import six
+@@ -188,9 +189,9 @@ class ScenarioRunner(plugin.Plugin, validation.ValidatablePluginMixin):
for i in range(processes_to_start):
kwrgs = {"processes_to_start": processes_to_start,
"processes_counter": i}