Commit 2d40a5d4 authored by Leigh B. Stoller's avatar Leigh B. Stoller
Browse files

Some pidly changes I want to get into the main branch before I commit

other changes to the commvirtsig branch.

* Run assign with nice; when assign is cranking (or when two are
  cranking!) boss gets really sluggish (web, DB).

* Minor change to "impotent" option; run a little longer and print out
  what the vlan table would look like.

* Two trivial grammer changes.
parent 949ee392
...@@ -580,7 +580,7 @@ sub RunAssign ($) ...@@ -580,7 +580,7 @@ sub RunAssign ($)
# the parent. # the parent.
# #
POSIX::setsid(); POSIX::setsid();
exec("assign $cmdargs > assign.log"); exec("nice assign $cmdargs > assign.log");
die("*** $0:\n". die("*** $0:\n".
" Could not start assign!\n"); " Could not start assign!\n");
} }
...@@ -1332,7 +1332,7 @@ foreach $plink (keys(%plinks)) { ...@@ -1332,7 +1332,7 @@ foreach $plink (keys(%plinks)) {
printdb " VLANS:\n"; printdb " VLANS:\n";
AddVlan("link", $dlink, $nodeportA, $nodeportB); AddVlan("link", $dlink, $nodeportA, $nodeportB);
AddVlan("lan", $lan, $nodeportD); AddVlan("lan", $lan, $nodeportD);
my ($member0,$delay,$bandwidth,$loss, my ($member0,$delay,$bandwidth,$loss,
$member1,$rdelay,$rbandwidth,$rloss) = @{$delaylinks{$plink}}; $member1,$rdelay,$rbandwidth,$rloss) = @{$delaylinks{$plink}};
...@@ -1488,10 +1488,6 @@ foreach $plink (keys(%plinks)) { ...@@ -1488,10 +1488,6 @@ foreach $plink (keys(%plinks)) {
} }
TBDebugTimeStamp("interpreting finished"); TBDebugTimeStamp("interpreting finished");
# Stop here ...
exit(0)
if ($impotent);
###################################################################### ######################################################################
# Step 4 - Upload to DB # Step 4 - Upload to DB
# #
...@@ -1503,6 +1499,10 @@ TBDebugTimeStamp("uploading started"); ...@@ -1503,6 +1499,10 @@ TBDebugTimeStamp("uploading started");
# Write the vlans to the DB. # Write the vlans to the DB.
UploadVlans(); UploadVlans();
# Stop here ...
exit(0)
if ($impotent);
PatchVeths(); PatchVeths();
# #
...@@ -2437,7 +2437,7 @@ sub AddVlan($$$;$) ...@@ -2437,7 +2437,7 @@ sub AddVlan($$$;$)
elsif (virtlanemulated($lan)) { elsif (virtlanemulated($lan)) {
# #
# Like above, except that in this case, its a bunch of vlinks # Like above, except that in this case, its a bunch of vlinks
# sharing a smaller set of physical links. Just mark is differently # sharing a smaller set of physical links. Just mark it differently
# here. See UploadVlans() below; these vlans will be merged to # here. See UploadVlans() below; these vlans will be merged to
# into one big supervlan since a nodeport can be in just one vlan # into one big supervlan since a nodeport can be in just one vlan
# at a time. # at a time.
...@@ -2495,16 +2495,22 @@ sub UploadVlans() ...@@ -2495,16 +2495,22 @@ sub UploadVlans()
} }
} }
printdb "Uploading vlans table.\n"; if (!$impotent) {
printdb "Uploading vlans table.\n";
}
else {
printdb "Dumping vlans table.\n";
}
foreach my $lanid (keys(%vlantable)) { foreach my $lanid (keys(%vlantable)) {
my $lan = (split(":", $lanid))[0]; my $lan = (split(":", $lanid))[0];
my $memberlist = join(" ", @{$vlantable{$lanid}}); my $memberlist = join(" ", @{$vlantable{$lanid}});
printdb " $lanid - $memberlist\n"; printdb " $lan - $memberlist\n";
DBQueryFatal("insert into vlans (id,pid,eid,virtual,members) ". DBQueryFatal("insert into vlans (id,pid,eid,virtual,members) ".
"values (0, '$pid', '$eid', '$lan', '$memberlist')"); "values (0, '$pid', '$eid', '$lan', '$memberlist')")
if (!$impotent);
} }
} }
......
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