Commit 77e45dff authored by Leigh Stoller's avatar Leigh Stoller

Checkpoint my DB changes so I can do some testing on boss.

* Add vnode0,vnode1 slots to the delays table. This will allow us to
  match ipfw pipes to nodes after swapin, hopefully allowing us to
  control the delays for lans in addition to duplex links.

* Add IPaliases to interfaces table. Used in assign_wrapper when
  constructing "emulated" links, which will share a link via the use
  of aliases on the interface. This is a comma separated list of IP
  addresses (no, I refuse to make this a separate table!).

* Add virtnode_capacity slot to node_types, defaults to zero. This is
  used in ptopgen for determining how many virtnodes fit on a real
  node. I have not thought this through completely, but it allows me
  to make progress on other fronts.

* Add linkdelays delays, which sorta resembles the delays table, only
  this table stores oneway delays links, to be set up on the endpoints
  of a link or lan. Also, instead of being based on ipfw bridge rules,
  it is based on IP address/mask rules. At some point this table may
  merge witk the delays table, but will take time to work out the
  details and I do not want to mess up existing experiments by
  changing the delays table! Anyway, a duplex link gets one of these
  for each endpoint (a xmit ipfw rule). To mimic our lan setup, lan
  links get two, an xmit *and* a recv rule. My hope is that link
  delays will look just like normal delays (a packet leaving a node
  for a lan will get the outgoing delay, and a packet arriving gets
  the incoming delay).
parent 2a534d88
......@@ -85,6 +85,8 @@ CREATE TABLE delays (
eid varchar(32) default NULL,
pid varchar(32) default NULL,
vname varchar(32) default NULL,
vnode0 varchar(32) default NULL,
vnode1 varchar(32) default NULL,
card0 tinyint(3) unsigned default NULL,
card1 tinyint(3) unsigned default NULL,
PRIMARY KEY (node_id,iface0,iface1),
......@@ -347,6 +349,7 @@ CREATE TABLE interfaces (
mac varchar(12) NOT NULL default '000000000000',
IP varchar(15) default NULL,
IPalias varchar(15) default NULL,
IPaliases text default NULL,
interface_type varchar(30) default NULL,
iface text,
current_speed enum('100','10','1000') NOT NULL default '100',
......@@ -399,6 +402,40 @@ CREATE TABLE lastlogin (
PRIMARY KEY (uid)
) TYPE=MyISAM;
--
-- Table structure for table 'linkdelays'
--
CREATE TABLE linkdelays (
node_id varchar(10) NOT NULL default '',
iface varchar(8) NOT NULL default '',
ip varchar(15) NOT NULL default '',
netmask varchar(15) NOT NULL default '255.255.255.255',
dir enum('xmit','recv') NOT NULL default 'xmit',
eid varchar(32) default NULL,
pid varchar(32) default NULL,
vlan varchar(32) NOT NULL default '',
vnode varchar(32) NOT NULL default '',
pipe smallint(5) unsigned NOT NULL default '0',
delay float(10,2) NOT NULL default '0.00',
bandwidth int(10) unsigned NOT NULL default '100',
lossrate float(10,3) NOT NULL default '0.000',
q_limit int(11) default '0',
q_maxthresh int(11) default '0',
q_minthresh int(11) default '0',
q_weight float default '0',
q_linterm int(11) default '0',
q_qinbytes tinyint(4) default '0',
q_bytes tinyint(4) default '0',
q_meanpsize int(11) default '0',
q_wait int(11) default '0',
q_setbit int(11) default '0',
q_droptail int(11) default '0',
q_red tinyint(4) default '0',
q_gentle tinyint(4) default '0',
PRIMARY KEY (node_id,vlan,vnode,dir)
) TYPE=MyISAM;
--
-- Table structure for table 'login'
--
......@@ -524,6 +561,7 @@ CREATE TABLE node_types (
imageid varchar(45) NOT NULL default '',
imageable tinyint(4) default '0',
delay_capacity tinyint(4) NOT NULL default '0',
virtnode_capacity tinyint(4) NOT NULL default '0',
control_iface text,
delay_osid varchar(35) default NULL,
pxe_boot_path text,
......
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