From 22706e74a3d50084295277e9328eb0c25c27abc5 Mon Sep 17 00:00:00 2001 From: "Mark A. Grondona" Date: Fri, 18 Feb 2022 15:14:51 -0800 Subject: [PATCH 1/2] t1011-dynstate-change.t: set match-format=rv1 for resource module Problem: The fluxtion resource and qmanager modules are reloaded multiple times in the t1011-dynstate-change.t test, but sometimes the resource module fails on a hello response for a job with: sched-fluxion-resource.err[0]: parse_R: no scheduling key in R Force the resource module to emit rv1 instead of rv1_nosched for these tests to avoid this error. Fixes #907 --- t/t1011-dynstate-change.t | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/t/t1011-dynstate-change.t b/t/t1011-dynstate-change.t index a12ab9ca5..b37ac2c8b 100755 --- a/t/t1011-dynstate-change.t +++ b/t/t1011-dynstate-change.t @@ -33,7 +33,7 @@ test_expect_success 'load test resources' ' ' test_expect_success 'dyn-state: loading fluxion modules works' ' - load_resource load-allowlist=cluster,node,core,gpu && + load_resource load-allowlist=cluster,node,core,gpu match-format=rv1 && load_qmanager ' @@ -118,7 +118,7 @@ test_expect_success 'dyn-state: removing fluxion modules' ' ' test_expect_success 'dyn-state: loading fluxion modules works' ' - load_resource load-allowlist=cluster,node,core,gpu && + load_resource load-allowlist=cluster,node,core,gpu match-format=rv1 && load_qmanager queue-policy=easy ' @@ -141,7 +141,7 @@ test_expect_success 'dyn-state: removing fluxion modules' ' ' test_expect_success 'dyn-state: loading fluxion modules works' ' - load_resource load-allowlist=cluster,node,core,gpu && + load_resource load-allowlist=cluster,node,core,gpu match-format=rv1 && load_qmanager queues="batch debug" \ queue-policy-per-queue="batch:easy debug:fcfs" ' @@ -171,7 +171,7 @@ test_expect_success 'dyn-state: removing fluxion modules' ' ' test_expect_success 'dyn-state: loading fluxion modules works' ' - load_resource load-allowlist=cluster,node,core,gpu && + load_resource load-allowlist=cluster,node,core,gpu match-format=rv1 && load_qmanager ' From dd08d2eb37f27df43cfa31bc843042878935d552 Mon Sep 17 00:00:00 2001 From: "Mark A. Grondona" Date: Sat, 19 Feb 2022 07:33:01 -0800 Subject: [PATCH 2/2] t1006-qmanager-multiqueue.t: add load-allowlist=node,core,gpu Problem: The t1006-qmanager-multiqueue.t test fails on systems with older hwloc with an error message like: grow: reader: Error getting the size of block storage device; Add `load-allowlist=node,core,gpu` to the load options for sched-fluxion-resource in this test as instructed by @dongahn. Fixes #908 Co-authored-by: Dong H. Ahn --- t/t1006-qmanager-multiqueue.t | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t1006-qmanager-multiqueue.t b/t/t1006-qmanager-multiqueue.t index ac9355c31..9c688ae2b 100755 --- a/t/t1006-qmanager-multiqueue.t +++ b/t/t1006-qmanager-multiqueue.t @@ -26,7 +26,7 @@ get_queue() { test_expect_success 'qmanager: loading qmanager with multiple queues' ' load_resource prune-filters=ALL:core \ -subsystems=containment policy=low && + subsystems=containment policy=low load-allowlist=node,core,gpu && load_qmanager "queues=all batch debug" '