Commit cf5c81d7 authored by Leigh B Stoller's avatar Leigh B Stoller

More work on mapper error processing, try to find the output from tyhe

last run of assign, which is especially important on the moonshot
cluster which is multi-architecture.
parent b9bcae1a
...@@ -2913,6 +2913,7 @@ sub GetTicketAuxAux($$$$$$$$$$$) ...@@ -2913,6 +2913,7 @@ sub GetTicketAuxAux($$$$$$$$$$$)
$output = $output =
GeniUtil::ExecQuiet("$MAPPER -a -d -v $aopts -z -o $tmpfile $pid $eid"); GeniUtil::ExecQuiet("$MAPPER -a -d -v $aopts -z -o $tmpfile $pid $eid");
if ($?) { if ($?) {
my $done = 0;
my $logstuff = ""; my $logstuff = "";
my $errorstr = ""; my $errorstr = "";
my $solution; my $solution;
...@@ -2953,16 +2954,16 @@ sub GetTicketAuxAux($$$$$$$$$$$) ...@@ -2953,16 +2954,16 @@ sub GetTicketAuxAux($$$$$$$$$$$)
# #
# The assign_wrapper2 script wraps assign, and basically # The assign_wrapper2 script wraps assign, and basically
# prints a bunch of stuff a second time. But it helpfully # prints a bunch of stuff a second time. But it helpfully
# print a tag line we can watch for. We can stop parsing # print a tag line we can watch for. Now we can ignore
# when we see it. # anything until we see another assign exit statement, which
# # means we ran assign multiple times.
last if ($line =~ /^ASSIGN FAILED/) {
if ($line =~ /^ASSIGN FAILED/); $done = 1;
next;
}
# Want just the first set of violations / solution / precheck. if ($line =~ /precheck:$/) {
if (!defined($precheck) && $line =~ /precheck:$/) {
$inprecheck = 1; $inprecheck = 1;
$precheck = "";
# Eat the line. # Eat the line.
next; next;
} }
......
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