All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit 89fb072c authored by Gary Wong's avatar Gary Wong

Abort on admission control violations, even when -p is specified.

(There is room for improvement here... in some cases we could and
should still perform partial allocation.)
parent ca8b6603
......@@ -255,7 +255,7 @@ foreach my $type ( keys( %types ) ) {
if( !Reservation->IsFeasible( $reservations, \$errormsg ) ) {
print "Existing admission control violation for type $type: $errormsg\n";
if( $admission_ctrl ) {
$noalloc++;
$error++;
}
print "Omitting admission control verification.\n";
goto admissionfailure;
......@@ -286,7 +286,7 @@ foreach my $type ( keys( %types ) ) {
# FIXME notify admins about violation
} else {
if( $admission_ctrl ) {
$noalloc++;
$error++;
}
}
goto admissionfailure;
......@@ -296,7 +296,7 @@ foreach my $type ( keys( %types ) ) {
admissionfailure:
# Now make the reservations in the DB.
if ((!$noalloc || $partial) && (@nodes || @oldnodes)) {
if ((!$noalloc || $partial) && (@nodes || @oldnodes) && !$error) {
print "Reserving nodes...\n"
if ($debug);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment