diff mbox series

[v2] app/test: fix autotest_runner crash

Message ID 20190612144647.26850-1-herakliusz.lipiec@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Thomas Monjalon
Headers
Series [v2] app/test: fix autotest_runner crash |

Checks

Context Check Description
ci/Intel-compilation success Compilation OK
ci/mellanox-Performance-Testing success Performance Testing PASS
ci/intel-Performance-Testing success Performance Testing PASS
ci/checkpatch success coding style OK

Commit Message

Herakliusz Lipiec June 12, 2019, 2:46 p.m. UTC 
  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")
Cc: anatoly.burakov@intel.com
Cc: stable@dpdk.org
Signed-off-by: Herakliusz Lipiec <herakliusz.lipiec@intel.com>
---
 app/test/autotest_runner.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

Comments

Burakov, Anatoly June 12, 2019, 2:48 p.m. UTC | #1 
On 12-Jun-19 3:46 PM, Herakliusz Lipiec wrote:
> 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")
> Cc: anatoly.burakov@intel.com
> Cc: stable@dpdk.org
> Signed-off-by: Herakliusz Lipiec <herakliusz.lipiec@intel.com>
> ---

Missed reviewed tag from previous revision.

Reviewed-by: Anatoly Burakov <anatoly.burakov@intel.com>
Thomas Monjalon July 4, 2019, 9:19 p.m. UTC | #2 
12/06/2019 16:48, Burakov, Anatoly:
> On 12-Jun-19 3:46 PM, Herakliusz Lipiec wrote:
> > 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")
> > Cc: anatoly.burakov@intel.com
> > Cc: stable@dpdk.org
> > Signed-off-by: Herakliusz Lipiec <herakliusz.lipiec@intel.com>
> 
> Missed reviewed tag from previous revision.
> 
> Reviewed-by: Anatoly Burakov <anatoly.burakov@intel.com>

Applied, thanks
diff mbox series

Patch

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
@@ -43,9 +43,16 @@  def get_numa_nodes():
 # find first (or any, really) CPU on a particular node, will be used to spread
 # 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))