Commit ddbf0e0c authored by Kevin Atkinson's avatar Kevin Atkinson

More bits of the backfill changes...

parent 98c95057
......@@ -3587,7 +3587,7 @@ CREATE TABLE `virt_lans` (
`delay` float(10,2) default '0.00',
`bandwidth` int(10) unsigned default NULL,
`est_bandwidth` int(10) unsigned default NULL,
`backfill` int(10) unsigned default NULL,
`backfill` int(10) unsigned default '0',
`lossrate` float(10,5) default NULL,
`q_limit` int(11) default '0',
`q_maxthresh` int(11) default '0',
......@@ -3607,7 +3607,7 @@ CREATE TABLE `virt_lans` (
`rdelay` float(10,2) default NULL,
`rbandwidth` int(10) unsigned default NULL,
`rest_bandwidth` int(10) unsigned default NULL,
`rbackfill` int(10) unsigned default NULL,
`rbackfill` int(10) unsigned default '0',
`rlossrate` float(10,5) default NULL,
`cost` float NOT NULL default '1',
`widearea` tinyint(4) default '0',
......
......@@ -4634,15 +4634,13 @@ last_net_act,last_cpu_act,last_ext_act);
4.166: Add backfill values to the database to be used in a future
commit:
alter table virt_lans add backfill int(10) unsigned
default NULL after bandwidth;
alter table virt_lans add rbackfill int(10) unsigned
default NULL after rbandwidth;
alter table virt_lans
add backfill int(10) unsigned default 0 after bandwidth,
add rbackfill int(10) unsigned default 0 after rbandwidth;
alter table delays add backfill0 int(10) unsigned
NOT NULL default '0' after bandwidth0;
alter table delays add backfill1 int(10) unsigned
NOT NULL default '0' after bandwidth1;
alter table delays
add backfill0 int(10) unsigned NOT NULL default 0 after bandwidth0,
add backfill1 int(10) unsigned NOT NULL default 0 after bandwidth1;
replace into table_regex VALUES
('virt_lans','backfill','int','redirect','default:int',
......@@ -4651,3 +4649,5 @@ last_net_act,last_cpu_act,last_ext_act);
('virt_lans','rbackfill','int','redirect','default:int',
0,2147483647,NULL);
4.167: Change to backfill default values in virt_lans, skip to next
entry
......@@ -364,7 +364,8 @@ sub DelaySetup
$pat .= q(MEANPSIZE1=(\d+) WAIT1=(\d+) SETBIT1=(\d+) );
$pat .= q(DROPTAIL1=(\d+) GENTLE1=(\d+) );
$pat .= q(VNODE0=([-\d\w]+) VNODE1=([-\d\w]+) );
$pat .= q(NOSHAPING=(\d+));
$pat .= q(NOSHAPING=(\d+) );
$pat .= q(BACKFILL0=(\d+) BACKFILL1=(\d+));
$delay =~ /$pat/;
......@@ -417,6 +418,9 @@ sub DelaySetup
my $vnode1 = $39;
my $noshaping = $40;
my $backfill1 = $41;
my $backfill2 = $42;
#
# Noshaping. All we wanted was to set up the bridge (above).
# We do not want to actually delay the packets via a pipe,
......@@ -514,9 +518,9 @@ sub DelaySetup
print DEL "ipfw add $p1 pipe $p1 ip from any to any in recv $iface1\n";
print DEL "ipfw add $p2 pipe $p2 ip from any to any in recv $iface2\n";
print DEL "ipfw pipe $p1 config delay ${delay1}ms ";
print DEL "bw ${bandw1}Kbit/s plr $plr1 $queue1 $redparams1\n";
print DEL "bw ${bandw1}Kbit/s backfill ${backfill1}Kbits/s plr $plr1 $queue1 $redparams1\n";
print DEL "ipfw pipe $p2 config delay ${delay2}ms ";
print DEL "bw ${bandw2}Kbit/s plr $plr2 $queue2 $redparams2\n";
print DEL "bw ${bandw2}Kbit/s backfill ${backfill2}Kbits/s plr $plr2 $queue2 $redparams2\n";
print STDOUT " $iface1/$iface2 pipe $p1 config delay ";
print STDOUT "${delay1}ms bw ${bandw1}Kbit/s plr $plr1 ";
......
......@@ -2496,14 +2496,15 @@ COMMAND_PROTOTYPE(dodelay)
"q0_droptail,q0_gentle, "
"q1_limit,q1_maxthresh,q1_minthresh,q1_weight,q1_linterm, "
"q1_qinbytes,q1_bytes,q1_meanpsize,q1_wait,q1_setbit, "
"q1_droptail,q1_gentle,vnode0,vnode1,noshaping "
"q1_droptail,q1_gentle,vnode0,vnode1,noshaping, "
"backfill0,backfill1"
" from delays as d "
"left join interfaces as i on "
" i.node_id=d.node_id and i.iface=iface0 "
"left join interfaces as j on "
" j.node_id=d.node_id and j.iface=iface1 "
" where d.node_id='%s'",
40, reqp->nodeid);
42, reqp->nodeid);
if (!res) {
error("DELAY: %s: DB Error getting delays!\n", reqp->nodeid);
return 1;
......@@ -2544,7 +2545,8 @@ COMMAND_PROTOTYPE(dodelay)
"MEANPSIZE1=%s WAIT1=%s SETBIT1=%s "
"DROPTAIL1=%s GENTLE1=%s "
"VNODE0=%s VNODE1=%s "
"NOSHAPING=%s\n",
"NOSHAPING=%s "
"BACKFILL0=%s BACKFILL1=%s\n",
row[0], row[1],
row[2], row[3], row[4], row[5],
row[7], row[8], row[9], row[10],
......@@ -2560,7 +2562,8 @@ COMMAND_PROTOTYPE(dodelay)
row[35], row[36],
(row[37] ? row[37] : "foo"),
(row[38] ? row[38] : "bar"),
row[39]);
row[39],
row[40], row[41]);
client_writeback(sock, buf, strlen(buf), tcp);
nrows--;
......
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