Commit 733d6cca authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files

Check to make sure we actually find peer of a tunnel connection.

I've seen about a dozen cases in the last two days of bad rspecs,
but not catching the fact that we cannot get peer ip from the
manifest on the other aggregate.
parent 250b8982
......@@ -2730,6 +2730,7 @@ sub Start($$)
my $count = 600;
my $interval = 30;
my $manifest;
my $dstip;
while ($count >= 0) {
my $blob = $authority->Resolve($slice->urn());
if (defined($blob)) {
......@@ -2788,7 +2789,15 @@ sub Start($$)
$msg = "Could not get routable IP for $component_id";
goto bad;
$member->SetAttribute("tunnel_dstip", $nodeblob->{'physctrl'});
$dstip = $nodeblob->{'physctrl'};
$member->SetAttribute("tunnel_dstip", $dstip);
# If we cannot find the peer in the manifest, user
# almost certainly made a mistake in the rspec.
if (!defined($dstip)) {
$msg = "Could not find remote IP for $peerid in $tunnel";
goto bad;
Supports Markdown
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