diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/benchmarking/Dockerfile | 1 | ||||
| -rw-r--r-- | docker/core/Dockerfile | 5 | ||||
| -rw-r--r-- | docker/core/Try-to-detect-the-race-conditions.patch | 153 | ||||
| -rw-r--r-- | docker/healthcheck/Dockerfile | 1 | ||||
| -rw-r--r-- | docker/smoke/Dockerfile | 1 | ||||
| -rw-r--r-- | docker/vnf/Dockerfile | 1 |
6 files changed, 161 insertions, 1 deletions
diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile index aaef5097c..ea418e293 100644 --- a/docker/benchmarking/Dockerfile +++ b/docker/benchmarking/Dockerfile @@ -16,6 +16,7 @@ RUN apk --no-cache add --update libxml2 libxslt && \ 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=tempest/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 ad408acd8..ed83723b6 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -5,6 +5,7 @@ ARG OPENSTACK_TAG=stable/train COPY Accept-custom-registered-endpoints.patch /tmp/Accept-custom-registered-endpoints.patch COPY Fixes-race-condition-in-test_add_remove_fixed_ip.patch /tmp/Fixes-race-condition-in-test_add_remove_fixed_ip.patch +COPY Try-to-detect-the-race-conditions.patch /tmp/Try-to-detect-the-race-conditions.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 \ @@ -28,7 +29,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/Try-to-detect-the-race-conditions.patch) && \ + rm -r upper-constraints.txt upper-constraints.opnfv.txt /src/functest \ + /tmp/Try-to-detect-the-race-conditions.patch && \ cp /usr/lib/python3.7/site-packages/functest/ci/logging.ini /usr/lib/python3.7/site-packages/xtesting/ci/ && \ cp /usr/lib/python3.7/site-packages/functest/ci/logging.debug.ini /usr/lib/python3.7/site-packages/xtesting/ci/ && \ bash -c "mkdir -p /var/lib/xtesting /home/opnfv" && \ diff --git a/docker/core/Try-to-detect-the-race-conditions.patch b/docker/core/Try-to-detect-the-race-conditions.patch new file mode 100644 index 000000000..f23e5daf8 --- /dev/null +++ b/docker/core/Try-to-detect-the-race-conditions.patch @@ -0,0 +1,153 @@ +From 19b79df9e72184cbcf16a4dc70086ada44dfb335 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 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Change-Id: I9b468ec1cf79e0a66abeb1fb48f5f0f067c2c198 +Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> +--- + rally/plugins/task/runners/constant.py | 8 ++++++++ + rally/task/runner.py | 15 +++++++++++++++ + rally/task/utils.py | 15 +++++++++++++++ + 3 files changed, 38 insertions(+) + +diff --git a/rally/plugins/task/runners/constant.py b/rally/plugins/task/runners/constant.py +index 5feb1fee1..755afb05a 100644 +--- a/rally/plugins/task/runners/constant.py ++++ b/rally/plugins/task/runners/constant.py +@@ -24,6 +24,10 @@ from rally.common import validation + from rally import consts + from rally.task import runner + ++from rally.common import cfg ++from rally.common import logging ++CONF = cfg.CONF ++LOG = logging.getLogger(__file__) + + def _worker_process(queue, iteration_gen, timeout, concurrency, times, + duration, context, cls, method_name, args, event_queue, +@@ -55,6 +59,9 @@ def _worker_process(queue, iteration_gen, timeout, concurrency, times, + """ + def _to_be_continued(iteration, current_duration, aborted, times=None, + duration=None): ++ LOG.warning( ++ "!! _to_be_continued %(iteration)s %(current_duration)s %(aborted)s %(times)s %(duration)s !! " % ++ {"iteration": iteration, "current_duration": current_duration, "aborted": aborted, "times": times, "duration": duration}) + if times is not None: + return iteration < times and not aborted.is_set() + elif duration is not None: +@@ -82,6 +89,7 @@ def _worker_process(queue, iteration_gen, timeout, concurrency, times, + collector_thr_by_timeout.start() + + iteration = next(iteration_gen) ++ LOG.warning("!! iteration %(iteration)s !! " % {"iteration": iteration}) + start_time = time.time() + # NOTE(msimonin): keep the previous behaviour + # > when duration is 0, scenario executes exactly 1 time +diff --git a/rally/task/runner.py b/rally/task/runner.py +index 3397e1193..3fda122ce 100644 +--- a/rally/task/runner.py ++++ b/rally/task/runner.py +@@ -87,6 +87,11 @@ def _run_scenario_once(cls, method_name, context_obj, scenario_kwargs, + + def _worker_thread(queue, cls, method_name, context_obj, scenario_kwargs, + event_queue): ++ LOG.debug( ++ "queue.put _run_scenario_once:\n\t%(cls)s\n\t%(method_name)s\n\t" ++ "%(context_obj)s\n\t%(scenario_kwargs)s\n\t%(event_queue)s" % ++ {"cls": cls, "method_name": method_name, "context_obj": context_obj, ++ "scenario_kwargs": scenario_kwargs, "event_queue": event_queue}) + queue.put(_run_scenario_once(cls, method_name, context_obj, + scenario_kwargs, event_queue)) + +@@ -186,6 +191,8 @@ class ScenarioRunner(plugin.Plugin, validation.ValidatablePluginMixin, + for i in range(processes_to_start): + kwrgs = {"processes_to_start": processes_to_start, + "processes_counter": i} ++ LOG.warning( ++ "!! _create_process_pool %(kwrgs)s !! " % {"kwrgs": kwrgs}) + process = multiprocessing.Process(target=worker_process, + args=next(worker_args_gen), + kwargs={"info": kwrgs}) +@@ -245,8 +252,13 @@ class ScenarioRunner(plugin.Plugin, validation.ValidatablePluginMixin, + if len(self.result_batch) >= self.batch_size: + sorted_batch = sorted(self.result_batch, + key=lambda r: result["timestamp"]) ++ LOG.debug("result_queue.append:\n\t%(sorted_batch)s" % { ++ "sorted_batch": sorted_batch ++ }) + self.result_queue.append(sorted_batch) + del self.result_batch[:] ++ else: ++ LOG.debug("WAHT DOEST IT MEAN? ") + + def send_event(self, type, value=None): + """Store event to send it to consumer later. +@@ -254,6 +266,9 @@ class ScenarioRunner(plugin.Plugin, validation.ValidatablePluginMixin, + :param type: Event type + :param value: Optional event data + """ ++ LOG.debug("send_event:\n\t%(type)s\n\t%(value)s" % { ++ "type": type, "value": value ++ }) + self.event_queue.append({"type": type, + "value": value}) + +diff --git a/rally/task/utils.py b/rally/task/utils.py +index 1252a1fc7..783adf3c6 100644 +--- a/rally/task/utils.py ++++ b/rally/task/utils.py +@@ -176,6 +176,9 @@ def wait_for_status(resource, ready_statuses, failure_statuses=["error"], + timeout=60, check_interval=1, check_deletion=False, + id_attr="id"): + ++ LOG.debug( ++ "Waiting for status %(resource)s" % {"resource": resource}) ++ + resource_repr = getattr(resource, "name", repr(resource)) + if not isinstance(ready_statuses, (set, list, tuple)): + raise ValueError("Ready statuses should be supplied as set, list or " +@@ -187,7 +190,11 @@ def wait_for_status(resource, ready_statuses, failure_statuses=["error"], + + # make all statuses upper case + ready_statuses = set(s.upper() for s in ready_statuses or []) ++ LOG.debug("%(resource)s: ready_statuses %(ready_statuses)s" % { ++ "resource": resource_repr, "ready_statuses": ready_statuses}) + failure_statuses = set(s.upper() for s in failure_statuses or []) ++ LOG.debug("%(resource)s: failure_statuses %(failure_statuses)s" % { ++ "resource": resource_repr, "failure_statuses": failure_statuses}) + + if (ready_statuses & failure_statuses): + raise ValueError( +@@ -205,9 +212,13 @@ def wait_for_status(resource, ready_statuses, failure_statuses=["error"], + start = time.time() + + latest_status = get_status(resource, status_attr) ++ LOG.debug("%(resource)s: latest_status %(latest_status)s" % { ++ "resource": resource_repr, "latest_status": latest_status}) + latest_status_update = start + + while True: ++ LOG.debug("%(resource)s: timeout %(timeout)s" % { ++ "resource": resource_repr, "timeout": timeout}) + try: + if id_attr == "id": + resource = update_resource(resource) +@@ -240,7 +251,11 @@ def wait_for_status(resource, ready_statuses, failure_statuses=["error"], + status=status, + fault="Status in failure list %s" % str(failure_statuses)) + ++ LOG.debug("%(resource)s: check_interval %(check_interval)s" % { ++ "resource": resource_repr, "check_interval": check_interval}) + time.sleep(check_interval) ++ LOG.debug("%(resource)s: elapsed_time %(elapsed_time)s" % { ++ "resource": resource_repr, "elapsed_time": time.time() - start}) + if time.time() - start > timeout: + raise exceptions.TimeoutException( + desired_status="('%s')" % "', '".join(ready_statuses), +-- +2.26.2 + diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile index 2a20441bf..610b7daf8 100644 --- a/docker/healthcheck/Dockerfile +++ b/docker/healthcheck/Dockerfile @@ -16,6 +16,7 @@ RUN apk --no-cache add --virtual .build-deps --update \ 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=tempest/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 8bb897a14..641a9097b 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -24,6 +24,7 @@ RUN apk --no-cache add --update libxml2 libxslt && \ 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=tempest/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 4b20efc19..093a7f243 100644 --- a/docker/vnf/Dockerfile +++ b/docker/vnf/Dockerfile @@ -31,6 +31,7 @@ RUN apk --no-cache add --update \ 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=tempest/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 && \ |