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 4f67fa1f authored by Leigh B Stoller's avatar Leigh B Stoller

Return vtopgen errors as mapping errors so that the caller (portal) knows.

parent 273e5ebb
......@@ -2078,6 +2078,16 @@ sub GetTicketAuxAux($$$$$$$$$$$)
if (!$istunnel && exists($external_nodemap{$node_nickname})) {
$encap = "vlan";
}
#
# If the link includes blockstores, it is a "sanlan" and so
# it has to be encap=vlan and best effort.
#
if (0 &&
defined($nodetype) && $nodetype->type() eq "blockstore") {
$encap = "vlan";
$trivial_ok = 0;
$besteffort = 1;
}
}
my $edgecount = 0;
......@@ -2416,11 +2426,12 @@ sub GetTicketAuxAux($$$$$$$$$$$)
my $tmpfile = POSIX::tmpnam();
# First a prerun to get the node counts and verify topo.
system("$VTOPGEN -p $pid $eid");
$output = GeniUtil::ExecQuiet("$VTOPGEN -p $pid $eid");
if ($?) {
print STDERR "$output\n";
$response =
GeniResponse->Create(GENIRESPONSE_ERROR, undef,
"Could not verify topo");
GeniResponse->Create(GENIRESPONSE_NO_MAPPING, undef,
"Could not verify topo:\n$output");
goto bad;
}
$slice_experiment->CleanLogFiles();
......
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