Skip to content
Snippets Groups Projects
Commit 500142b7 authored by Moe Jette's avatar Moe Jette
Browse files

Handle new restrictions on who can set event triggers.

parent bdba5e06
No related branches found
No related tags found
No related merge requests found
......@@ -65,9 +65,14 @@ set cwd "[$bin_pwd]"
exec $bin_rm -f $file_in $file_out
make_bash_script $file_in "$bin_echo DOWN >$cwd/$file_out"
set matches 0
set disabled 0
set matches 0
set strigger_pid [spawn $strigger --set -v --down --program=$cwd/$file_in]
expect {
-re "Operation not permitted" {
set disabled 1
exp_continue
}
-re "trigger set" {
incr matches
exp_continue
......@@ -81,6 +86,11 @@ expect {
wait
}
}
if {$disabled == 1} {
send_user "\nWARNING: Current configuration prevents setting triggers\n"
send_user " Need to run as SlurmUser or make SlurmUser=root\n"
exit $exit_code
}
if {$matches == 0} {
send_user "\nFAILURE: trigger creation failure\n"
exit 1
......
......@@ -65,9 +65,14 @@ set cwd "[$bin_pwd]"
exec $bin_rm -f $file_in $file_out
make_bash_script $file_in "$bin_echo RECONFIG >$cwd/$file_out"
set matches 0
set disabled 0
set matches 0
set strigger_pid [spawn $strigger --set -v --reconfig --program=$cwd/$file_in]
expect {
-re "Operation not permitted" {
set disabled 1
exp_continue
}
-re "trigger set" {
incr matches
exp_continue
......@@ -81,6 +86,11 @@ expect {
wait
}
}
if {$disabled == 1} {
send_user "\nWARNING: Current configuration prevents setting triggers\n"
send_user " Need to run as SlurmUser or make SlurmUser=root\n"
exit $exit_code
}
if {$matches == 0} {
send_user "\nFAILURE: trigger creation failure\n"
exit 1
......
......@@ -98,9 +98,14 @@ make_bash_script $file_in_fini "
$bin_sleep 5
$squeue -j $job_id -tall >$cwd/$file_out_fini"
set matches 0
set disabled 0
set matches 0
set strigger_pid [spawn $strigger --set -v --time --jobid=$job_id --offset=-90 --program=$cwd/$file_in_time]
expect {
-re "Operation not permitted" {
set disabled 1
exp_continue
}
-re "trigger set" {
incr matches
exp_continue
......@@ -114,6 +119,12 @@ expect {
wait
}
}
if {$disabled == 1} {
send_user "\nWARNING: Current configuration prevents setting triggers\n"
send_user " Need to run as SlurmUser or make SlurmUser=root\n"
cancel_job $job_id
exit $exit_code
}
if {$matches == 0} {
send_user "\nFAILURE: trigger creation failure\n"
set exit_code 1
......
......@@ -31,7 +31,7 @@
############################################################################
source ./globals
set test_id "19.5"
set test_id "19.6"
set exit_code 0
set file_in "test$test_id.input"
set file_in_fini "test$test_id.fini_input"
......@@ -97,9 +97,14 @@ if {$job_id == 0} {
#
# Now add a couple of triggers for that job
#
set matches 0
set disabled 0
set matches 0
set strigger_pid [spawn $strigger --set -v --time --jobid=$job_id --offset=-30 --program=$cwd/$file_in_time]
expect {
-re "Operation not permitted" {
set disabled 1
exp_continue
}
-re "trigger set" {
incr matches
exp_continue
......@@ -113,6 +118,12 @@ expect {
wait
}
}
if {$disabled == 1} {
send_user "\nWARNING: Current configuration prevents setting triggers\n"
send_user " Need to run as SlurmUser or make SlurmUser=root\n"
cancel_job $job_id
exit $exit_code
}
if {$matches == 0} {
send_user "\nFAILURE: trigger creation failure\n"
set exit_code 1
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment