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 cfb9f9e1 authored by Gary Wong's avatar Gary Wong

Ignore irrelevant reservation violations when attempting extensions.

parent 2f6f393a
......@@ -1182,6 +1182,7 @@ sub ExtendSlice($$$;$$$) {
my $version = GetVersion( $class );
foreach my $type ( @types ) {
my $reservations = LookupAll( $class, $type );
my $conflicttime;
foreach my $res ( @$reservations ) {
if( defined( $res->pid() ) && defined( $res->eid() ) &&
$res->pid() eq $expt->pid() &&
......@@ -1190,7 +1191,8 @@ sub ExtendSlice($$$;$$$) {
last;
}
}
if( !$force && !IsFeasible( $class, $reservations, $error ) ) {
if( !$force && !IsFeasible( $class, $reservations, $error,
\$conflicttime ) && $conflicttime < $new_expire ) {
return -1;
}
}
......
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