Commit a70b63df authored by Mike Hibler's avatar Mike Hibler
Browse files

Hack: increase the "base" reload wait time to 10 minutes for now.

Til we resolve local multicast issues.  This should be a sitevar, but
don't have time to do all the plumbing, update scripts, etc. right now.
Also not sure if the libosload_new code is right, should the variable
I introduced by global like MAXRETRIES is?
parent fa811184
......@@ -43,6 +43,10 @@ my $PROJROOT = "@PROJROOT_DIR@";
# for the occasional pxeboot failure.
my $MAXRETRIES = 1;
# Hack constant factor (slop) to add to the max reload wait time for any node
# This is set based on testbed-wide factors (like multicast being dog slow!)
my $TBLOADWAIT = (10 * 60);
my $OUTERBOSS = "@OUTERBOSS_NODENAME@";
my $osselect = "$TB/bin/os_select";
my $TBUISP = "$TB/bin/tbuisp";
......@@ -814,7 +818,7 @@ sub GetImageInfo($;$)
if (!defined($rowref->{'maxloadwait'})) {
my $chunks = $imagesize >> 20; # size may be > 2^31, shift is unsigned
$rowref->{'maxloadwait'} = int((($chunks / 100.0) * 65) + (5 * 60));
$rowref->{'maxloadwait'} = int((($chunks / 100.0) * 65) + $TBLOADWAIT;
}
print STDERR
......
......@@ -50,6 +50,13 @@ my $FRISBEE = "$TB/sbin/frisbee";
#
$MAXRETRIES = 1;
#
# Hack constant factor (slop) to add to the max reload wait time for any node
# This is set based on testbed-wide factors (like multicast being dog slow!)
# XXX should this be exported like MAXRETRIES?
#
my $TBLOADWAIT = (10 * 60);
# Locals
my $remote_mult = 5; # Wait lots longer for remote nodes!
......@@ -2055,7 +2062,7 @@ sub ComputeMaxLoadWaitTime($$)
$maxwait += int(($chunks / 100.0) * 65);
}
return $maxwait + (5 * 60);
return $maxwait + $TBLOADWAIT;
}
sub PreSetupReload($$)
......
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