Commit 94c49e19 authored by Leigh B. Stoller's avatar Leigh B. Stoller

Add new table for mapping auxtypes back to their parent in the

node_types table. This should make it easier to assign last mile
types to widearea nodes since a given type can now have as many
subtypes as you like.

Also add cpu_usage and mem_usage to the experiments table. The
user will be able to specify these in the NS file. Currently a
tinyint, where the default is zero, which means ignore.
parent ed9dcddb
......@@ -276,6 +276,8 @@ CREATE TABLE experiments (
last_swap_req datetime default NULL,
idle_ignore tinyint(4) NOT NULL default '0',
sync_server varchar(32) default NULL,
cpu_usage tinyint(4) unsigned NOT NULL default '0',
mem_usage tinyint(4) unsigned NOT NULL default '0',
idx int(10) unsigned NOT NULL auto_increment,
PRIMARY KEY (eid,pid),
KEY idx (idx),
......@@ -692,6 +694,7 @@ CREATE TABLE node_status (
PRIMARY KEY (node_id)
) TYPE=MyISAM;
--
-- Table structure for table 'node_type_features'
--
......@@ -734,6 +737,16 @@ CREATE TABLE node_types (
PRIMARY KEY (type)
) TYPE=MyISAM;
--
-- Table structure for table 'node_types_auxtypes'
--
CREATE TABLE node_types_auxtypes (
auxtype varchar(30) NOT NULL default '',
type varchar(30) NOT NULL default '',
PRIMARY KEY (auxtype)
) TYPE=MyISAM;
--
-- Table structure for table 'nodeipportnum'
--
......
......@@ -924,3 +924,19 @@ last_net_act,last_cpu_act,last_ext_act);
create table node_auxtypes (node_id varchar(10) not null, type \
varchar(30) not null, count int default 1, primary \
key(node_id,type));
1.179: Add a table to map auxtypes to node_types table.
CREATE TABLE node_types_auxtypes (
auxtype varchar(30) NOT NULL default '',
type varchar(30) NOT NULL default '',
PRIMARY KEY (auxtype)
) TYPE=MyISAM;
Add cpu_usage and mem_usage to experiments table. Typed as tiny
ints, zero means ignore.
alter table experiments add cpu_usage tinyint(4) unsigned \
NOT NULL default '0' after sync_server;
alter table experiments add mem_usage tinyint(4) unsigned \
NOT NULL default '0' after cpu_usage;
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