From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id B25B2A046B for ; Fri, 23 Aug 2019 11:45:31 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A87DF1BF9C; Fri, 23 Aug 2019 11:45:31 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 8EEC51BF9C for ; Fri, 23 Aug 2019 11:45:29 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 09F5880F79; Fri, 23 Aug 2019 09:45:29 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-48.ams2.redhat.com [10.36.116.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id F14955C226; Fri, 23 Aug 2019 09:45:27 +0000 (UTC) From: Kevin Traynor To: Herakliusz Lipiec Cc: Anatoly Burakov , dpdk stable Date: Fri, 23 Aug 2019 10:43:34 +0100 Message-Id: <20190823094336.12078-44-ktraynor@redhat.com> In-Reply-To: <20190823094336.12078-1-ktraynor@redhat.com> References: <20190823094336.12078-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Fri, 23 Aug 2019 09:45:29 +0000 (UTC) Subject: [dpdk-stable] patch 'test: fix autotest crash' has been queued to LTS release 18.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/28/19. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/08385dc344141eccac5ebea8a8782a373109774a Thanks. Kevin Traynor --- >From 08385dc344141eccac5ebea8a8782a373109774a Mon Sep 17 00:00:00 2001 From: Herakliusz Lipiec Date: Wed, 12 Jun 2019 15:46:47 +0100 Subject: [PATCH] test: fix autotest crash [ upstream commit c6ad35c468451466720009b374c9b19c43b9f7ae ] On some systems when dpdk test is executed with make test command autotest_runner crashes in first_cpu_on_node. This happens when list of available cpus contains something that is not a cpu as first element. Fixed by removing all non-cpu values from list of available cpus. Bugzilla ID: 253 Fixes: 22dcd9a4d90f ("test: parallelize unit tests") Signed-off-by: Herakliusz Lipiec Reviewed-by: Anatoly Burakov --- test/test/autotest_runner.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/test/test/autotest_runner.py b/test/test/autotest_runner.py index 36941a40a..8e7a45678 100644 --- a/test/test/autotest_runner.py +++ b/test/test/autotest_runner.py @@ -44,7 +44,14 @@ def get_numa_nodes(): # processes around NUMA nodes to avoid exhausting memory on particular node def first_cpu_on_node(node_nr): - cpu_path = glob.glob("/sys/devices/system/node/node%d/cpu*" % node_nr)[0] - cpu_name = os.path.basename(cpu_path) - m = re.match(r"cpu(\d+)", cpu_name) + cpu_path = glob.glob("/sys/devices/system/node/node%d/cpu*" % node_nr) + r = re.compile(r"cpu(\d+)") + cpu_name = filter(None, + map(r.match, + map(os.path.basename, cpu_path) + ) + ) + # for compatibility between python 3 and 2 we need to make interable out + # of filter return as it returns list in python 2 and a generator in 3 + m = next(iter(cpu_name)) return int(m.group(1)) -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-08-22 19:38:23.291675928 +0100 +++ 0044-test-fix-autotest-crash.patch 2019-08-22 19:38:20.476025950 +0100 @@ -1 +1 @@ -From c6ad35c468451466720009b374c9b19c43b9f7ae Mon Sep 17 00:00:00 2001 +From 08385dc344141eccac5ebea8a8782a373109774a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c6ad35c468451466720009b374c9b19c43b9f7ae ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ - app/test/autotest_runner.py | 13 ++++++++++--- + test/test/autotest_runner.py | 13 ++++++++++--- @@ -21,4 +22,4 @@ -diff --git a/app/test/autotest_runner.py b/app/test/autotest_runner.py -index b72716e1e..95e74c760 100644 ---- a/app/test/autotest_runner.py -+++ b/app/test/autotest_runner.py +diff --git a/test/test/autotest_runner.py b/test/test/autotest_runner.py +index 36941a40a..8e7a45678 100644 +--- a/test/test/autotest_runner.py ++++ b/test/test/autotest_runner.py