From 0b12e5b4324bf90c22b9c35aac5e439c10d71447 Mon Sep 17 00:00:00 2001 From: jacobtkeio Date: Mon, 2 Dec 2024 12:07:54 -0800 Subject: [PATCH] debug/temporary: cat outfile and dmesg in t4010 Also reload s-f-feasibility during resource load --- t/t4010-match-conf.t | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/t/t4010-match-conf.t b/t/t4010-match-conf.t index f25268489..e182d875f 100755 --- a/t/t4010-match-conf.t +++ b/t/t4010-match-conf.t @@ -25,7 +25,9 @@ start_resource () { "flux module reload -f sched-fluxion-resource ${RESOURCE_OPTIONS} && "\ "flux module reload -f sched-fluxion-qmanager && "\ "flux module stats sched-fluxion-qmanager && "\ -"flux ion-resource params >${outfile}" +"flux module reload -f sched-fluxion-feasibility && "\ +"flux ion-resource params >${outfile} && "\ +"flux dmesg" } start_resource_noconfig () { local outfile=$1; shift @@ -34,7 +36,9 @@ start_resource_noconfig () { "flux module reload -f sched-fluxion-resource ${RESOURCE_OPTIONS} && "\ "flux module reload -f sched-fluxion-qmanager && "\ "flux module stats sched-fluxion-qmanager && "\ -"flux ion-resource params >${outfile}" +"flux module reload -f sched-fluxion-feasibility && "\ +"flux ion-resource params >${outfile} && "\ +"flux dmesg" } check_load_file(){ test $(jq '.params."load-file"' ${1}) = ${2} @@ -71,21 +75,32 @@ test_expect_success 'resource: sched-fluxion-resource loads with no config' ' check_match_format ${outfile} "\"rv1_nosched\"" && check_match_subsystems ${outfile} "\"containment\"" && check_reserve_vtx_vec ${outfile} 0 && - check_prune_filters ${outfile} "\"ALL:core\"" + check_prune_filters ${outfile} "\"ALL:core\"" && + cat ${outfile} ' test_expect_success 'resource: sched-fluxion-resource loads with valid toml' ' conf_name="01-default" && outfile=${conf_name}.out && + cat ${outfile} && start_resource ${conf_base}/${conf_name} ${outfile} && + cat ${outfile} && check_load_file ${outfile} null && + cat ${outfile} && check_load_format ${outfile} "\"rv1exec\"" && + cat ${outfile} && check_load_allowlist ${outfile} "\"node,core,gpu\"" && + cat ${outfile} && check_match_policy ${outfile} "\"lonodex\"" && + cat ${outfile} && check_match_format ${outfile} "\"rv1_nosched\"" && + cat ${outfile} && check_match_subsystems ${outfile} "\"containment\"" && + cat ${outfile} && check_reserve_vtx_vec ${outfile} 200000 && - check_prune_filters ${outfile} "\"ALL:core,ALL:gpu\"" + cat ${outfile} && + check_prune_filters ${outfile} "\"ALL:core,ALL:gpu\"" && + cat ${outfile} ' test_expect_success 'resource: module load options take precedence' ' @@ -100,7 +115,8 @@ test_expect_success 'resource: module load options take precedence' ' check_match_format ${outfile} "\"rv1\"" && check_match_subsystems ${outfile} "\"containment\"" && check_reserve_vtx_vec ${outfile} 200000 && - check_prune_filters ${outfile} "\"ALL:core,ALL:gpu\"" + check_prune_filters ${outfile} "\"ALL:core,ALL:gpu\"" && + cat ${outfile} ' test_expect_success 'resource: sched-fluxion-resource loads with no keys' ' @@ -114,7 +130,8 @@ test_expect_success 'resource: sched-fluxion-resource loads with no keys' ' check_match_format ${outfile} "\"rv1_nosched\"" && check_match_subsystems ${outfile} "\"containment\"" && check_reserve_vtx_vec ${outfile} 0 && - check_prune_filters ${outfile} "\"ALL:core\"" + check_prune_filters ${outfile} "\"ALL:core\"" && + cat ${outfile} ' test_expect_success 'resource: sched-fluxion-resource loads with extra keys' ' @@ -128,14 +145,16 @@ test_expect_success 'resource: sched-fluxion-resource loads with extra keys' ' check_match_format ${outfile} "\"rv1_nosched\"" && check_match_subsystems ${outfile} "\"containment\"" && check_reserve_vtx_vec ${outfile} 200000 && - check_prune_filters ${outfile} "\"ALL:core,ALL:gpu\"" + check_prune_filters ${outfile} "\"ALL:core,ALL:gpu\"" && + cat ${outfile} ' test_expect_success 'resource: load must tolerate an invalid policy' ' conf_name="09-invalid-policy" && outfile=${conf_name}.out && start_resource ${conf_base}/${conf_name} ${outfile} && - check_match_policy ${outfile} "\"first\"" + check_match_policy ${outfile} "\"first\"" && + cat ${outfile} ' test_expect_success 'resource: load must fail on a bad value' '