Commit b5f1ee0e authored by Leigh Stoller's avatar Leigh Stoller

Add tunnels table, loaded by assign_wrapper. This tables lists what

tunnels need to be created on each node; will be returned as a new
tmcd command.

Add nodeipportnum table, which is a hacky way to allocate non
overlapping port numbers on physical nodes (when multiple virtual
nodes are mapped to them). Used in assign_wrapper as a post pass over
the trafgens table and the tunnels table.

Add target_vname to virt_trafgens table as an aid in post passing.
parent f1e4c4d6
......@@ -396,9 +396,8 @@ CREATE TABLE node_idlestats (
load_1min float NOT NULL default '0',
load_5min float NOT NULL default '0',
load_15min float NOT NULL default '0',
PRIMARY KEY (node_id, tstamp)
) TYPE = MyISAM;
PRIMARY KEY (node_id,tstamp)
) TYPE=MyISAM;
#
# Table structure for table 'node_types'
......@@ -425,6 +424,16 @@ CREATE TABLE node_types (
PRIMARY KEY (type)
) TYPE=MyISAM;
#
# Table structure for table 'nodeipportnum'
#
CREATE TABLE nodeipportnum (
node_id varchar(10) NOT NULL default '',
port smallint(5) unsigned NOT NULL default '5000',
PRIMARY KEY (node_id)
) TYPE=MyISAM;
#
# Table structure for table 'nodelog'
#
......@@ -738,6 +747,24 @@ CREATE TABLE tmcd_redirect (
PRIMARY KEY (node_id)
) TYPE=MyISAM;
#
# Table structure for table 'tunnels'
#
CREATE TABLE tunnels (
pid varchar(12) NOT NULL default '',
eid varchar(32) NOT NULL default '',
node_id varchar(10) NOT NULL default '',
vname varchar(32) NOT NULL default '',
isserver tinyint(3) unsigned NOT NULL default '0',
port int(11) NOT NULL default '0',
peer_ip varchar(32) NOT NULL default '',
password varchar(32) NOT NULL default '',
encrypt tinyint(3) unsigned NOT NULL default '0',
compress tinyint(3) unsigned NOT NULL default '0',
PRIMARY KEY (pid,eid,node_id,vname)
) TYPE=MyISAM;
#
# Table structure for table 'uidnodelastlogin'
#
......@@ -898,6 +925,7 @@ CREATE TABLE virt_trafgens (
port int(11) NOT NULL default '0',
ip varchar(15) NOT NULL default '',
target_vnode varchar(32) NOT NULL default '',
target_vname varchar(32) NOT NULL default '',
target_port int(11) NOT NULL default '0',
target_ip varchar(15) NOT NULL default '',
generator tinytext NOT NULL,
......@@ -941,6 +969,20 @@ CREATE TABLE webdb_table_permissions (
PRIMARY KEY (table_name)
) TYPE=MyISAM;
#
# Table structure for table 'widearea_delays'
#
CREATE TABLE widearea_delays (
IP1 varchar(15) default NULL,
IP2 varchar(15) default NULL,
time double unsigned default NULL,
node_id1 text,
iface1 text,
node_id2 varchar(10) default NULL,
iface2 text
) TYPE=MyISAM;
#
# Table structure for table 'wires'
#
......
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