Commit 0bff7406 authored by Leigh Stoller's avatar Leigh Stoller

Cull out stitching aggregates when doing linktest.

parent 6d14d4e7
......@@ -2084,7 +2084,15 @@ sub DoLinktest()
$instance->SetStatus("linktest");
my @return_codes = ();
my @agglist = $instance->AggregateList();
my @agglist = ();
#
# Cull out any aggregates with no nodes.
#
foreach my $agg ($instance->AggregateList()) {
push(@agglist, $agg)
if ($agg->physnode_count() || $agg->virtnode_count());
}
if (ParRun({"maxwaittime" => 99999,
"maxchildren" => scalar(@agglist)},
\@return_codes, $coderef, @agglist)) {
......
<?php
#
# Copyright (c) 2006-2015 University of Utah and the Flux Group.
# Copyright (c) 2006-2016 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -623,6 +623,8 @@ class InstanceSliver
function public_url() { return $this->field('public_url'); }
function webtask_id() { return $this->field('webtask_id'); }
function manifest() { return $this->field('manifest'); }
function physnode_count() { return $this->field('physnode_count'); }
function virtnode_count() { return $this->field('virtnode_count'); }
function aggregate_name() {
global $urn_mapping;
return $urn_mapping[$this->aggregate_urn()];
......
......@@ -1254,6 +1254,9 @@ function Do_Linktest()
if ($sliver->webtask_id() &&
$webtask = WebTask::Lookup($sliver->webtask_id())) {
if (!($sliver->physnode_count() || $sliver->virtnode_count())) {
continue;
}
$tmp = array();
$tmp["status"] = $webtask->TaskValue("status");
if ($webtask->TaskValue("status") == "running") {
......
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