Commit 8ed26b13 authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files

Throttle frisbee memory usage!

parent 08a05b25
...@@ -424,7 +424,7 @@ sub downloadImage($$$$) { ...@@ -424,7 +424,7 @@ sub downloadImage($$$$) {
$proxyopt = "-P $nodeid"; $proxyopt = "-P $nodeid";
} }
if ($server && $imageid) { if ($server && $imageid) {
mysystem2("$FRISBEE $proxyopt ". mysystem2("$FRISBEE -M 64 $proxyopt ".
" -S $server -B 30 -F $imageid $imagepath"); " -S $server -B 30 -F $imageid $imagepath");
return -1 return -1
if ($?); if ($?);
...@@ -438,13 +438,14 @@ sub downloadImage($$$$) { ...@@ -438,13 +438,14 @@ sub downloadImage($$$$) {
my $mcastaddr = $1; my $mcastaddr = $1;
my $mcastport = $2; my $mcastport = $2;
mysystem2("$FRISBEE -m $mcastaddr -p $mcastport $imagepath"); mysystem2("$FRISBEE -M 64 -m $mcastaddr -p $mcastport $imagepath");
return -1 return -1
if ($?); if ($?);
} }
elsif ($addr =~ /^http/) { elsif ($addr =~ /^http/) {
if ($todisk) { if ($todisk) {
mysystem("wget -nv -N -P -O - '$addr' | $IMAGEUNZIP - $imagepath"); mysystem("wget -nv -N -P -O - '$addr' | ".
"$IMAGEUNZIP -W 32 - $imagepath");
} else { } else {
mysystem("wget -nv -N -P -O $imagepath '$addr'"); mysystem("wget -nv -N -P -O $imagepath '$addr'");
} }
...@@ -603,7 +604,7 @@ sub createExtraFS($$$) ...@@ -603,7 +604,7 @@ sub createExtraFS($$$)
system("mkdir $path") == 0 system("mkdir $path") == 0
or return -1; or return -1;
system("/usr/sbin/lvcreate -n extrafs -L $size $vgname") == 0 system("lvcreate -n extrafs -L $size $vgname") == 0
or return -1; or return -1;
system("mke2fs -j /dev/$vgname/extrafs") == 0 system("mke2fs -j /dev/$vgname/extrafs") == 0
......
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