Commit d5c51dd2 authored by Leigh B. Stoller's avatar Leigh B. Stoller

Change to eventlist table; bump size of vname from 20 to 64. I do not

see (or remember) any reason for this slot to be 20 chars, when the
name of every other vname slot is 32. I looked in the event scheduler
and there do not appear to be any problems there with bumping it. Note
that I choose 64 cause we tend to construct agent names that might be
longer then 32 since they are based on real vnames (lan0, node0, etc).
parent 619fd30b
......@@ -156,7 +156,7 @@ CREATE TABLE eventlist (
idx int(10) unsigned NOT NULL auto_increment,
time float(10,3) NOT NULL default '0.000',
vnode varchar(32) NOT NULL default '',
vname varchar(20) NOT NULL default '',
vname varchar(64) NOT NULL default '',
objecttype smallint(5) unsigned NOT NULL default '0',
eventtype smallint(5) unsigned NOT NULL default '0',
arguments text,
......@@ -1589,7 +1589,7 @@ CREATE TABLE veth_interfaces (
CREATE TABLE virt_agents (
pid varchar(12) NOT NULL default '',
eid varchar(32) NOT NULL default '',
vname varchar(32) NOT NULL default '',
vname varchar(64) NOT NULL default '',
vnode varchar(32) NOT NULL default '',
objecttype smallint(5) unsigned NOT NULL default '0',
PRIMARY KEY (pid,eid,vname,vnode)
......
......@@ -458,7 +458,7 @@ REPLACE INTO table_regex VALUES ('eventlist','pid','text','redirect','projects:p
REPLACE INTO table_regex VALUES ('eventlist','eid','text','redirect','experiments:eid',0,0,NULL);
REPLACE INTO table_regex VALUES ('eventlist','time','float','redirect','default:float',0,0,NULL);
REPLACE INTO table_regex VALUES ('eventlist','vnode','text','redirect','virt_agents:vnode',0,0,NULL);
REPLACE INTO table_regex VALUES ('eventlist','vname','text','regex','^[-\\w\\(\\)]+$',1,20,NULL);
REPLACE INTO table_regex VALUES ('eventlist','vname','text','regex','^[-\\w\\(\\)]+$',1,64,NULL);
REPLACE INTO table_regex VALUES ('eventlist','objecttype','int','redirect','default:tinyint',0,0,NULL);
REPLACE INTO table_regex VALUES ('eventlist','eventtype','int','redirect','default:tinyint',0,0,NULL);
REPLACE INTO table_regex VALUES ('eventlist','arguments','text','redirect','default:text',0,1024,NULL);
......@@ -549,7 +549,7 @@ REPLACE INTO table_regex VALUES ('virt_nodes','fixed','text','regex','^[-\\w]*$'
REPLACE INTO table_regex VALUES ('virt_programs','pid','text','redirect','projects:pid',0,0,NULL);
REPLACE INTO table_regex VALUES ('virt_programs','eid','text','redirect','experiments:eid',0,0,NULL);
REPLACE INTO table_regex VALUES ('virt_programs','vnode','text','redirect','virt_nodes:vname',0,0,NULL);
REPLACE INTO table_regex VALUES ('virt_programs','vname','text','redirect','eventlist:vname',0,0,NULL);
REPLACE INTO table_regex VALUES ('virt_programs','vname','text','regex','^[-\\w\\(\\)]+$',1,32,NULL);
REPLACE INTO table_regex VALUES ('virt_programs','command','text','redirect','default:tinytext',0,0,NULL);
REPLACE INTO table_regex VALUES ('virt_routes','pid','text','redirect','projects:pid',0,0,NULL);
REPLACE INTO table_regex VALUES ('virt_routes','eid','text','redirect','experiments:eid',0,0,NULL);
......@@ -563,13 +563,13 @@ REPLACE INTO table_regex VALUES ('virt_routes','cost','float','redirect','defaul
REPLACE INTO table_regex VALUES ('virt_trafgens','pid','text','redirect','projects:pid',0,0,NULL);
REPLACE INTO table_regex VALUES ('virt_trafgens','eid','text','redirect','experiments:eid',0,0,NULL);
REPLACE INTO table_regex VALUES ('virt_trafgens','vnode','text','redirect','virt_nodes:vname',0,0,NULL);
REPLACE INTO table_regex VALUES ('virt_trafgens','vname','text','redirect','eventlist:vname',0,0,NULL);
REPLACE INTO table_regex VALUES ('virt_trafgens','vname','text','regex','^[-\\w\\(\\)]+$',1,32,NULL);
REPLACE INTO table_regex VALUES ('virt_trafgens','role','text','redirect','default:tinytext',0,0,NULL);
REPLACE INTO table_regex VALUES ('virt_trafgens','proto','text','redirect','default:tinytext',0,0,NULL);
REPLACE INTO table_regex VALUES ('virt_trafgens','port','text','redirect','default:int',0,0,NULL);
REPLACE INTO table_regex VALUES ('virt_trafgens','ip','text','regex','^(\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3})$',0,15,NULL);
REPLACE INTO table_regex VALUES ('virt_trafgens','target_vnode','text','redirect','virt_nodes:vname',0,0,NULL);
REPLACE INTO table_regex VALUES ('virt_trafgens','target_vname','text','redirect','eventlist:vname',0,0,NULL);
REPLACE INTO table_regex VALUES ('virt_trafgens','target_vname','text','regex','^[-\\w\\(\\)]+$',1,32,NULL);
REPLACE INTO table_regex VALUES ('virt_trafgens','target_port','text','redirect','virt_trafgens:port',0,0,NULL);
REPLACE INTO table_regex VALUES ('virt_trafgens','target_ip','text','redirect','virt_trafgens:ip',0,15,NULL);
REPLACE INTO table_regex VALUES ('virt_trafgens','generator','text','redirect','default:tinytext',0,0,NULL);
......
......@@ -1493,4 +1493,21 @@ last_net_act,last_cpu_act,last_ext_act);
insert into node_hostkeys (node_id, sfshostid) \
select node_id,sfshostid from nodes;
Be sure to restart tmcd after you make these changes.
\ No newline at end of file
Be sure to restart tmcd after you make these changes.
1.241: Change to eventlist table; bump size of vname from 20 to 64. I
do not see (or remember) any reason for this slot to be 20
chars, when the name of every other vname slot is 32. I looked
in the event scheduler and there do not appear to be any
problems there with bumping it. Note that I choose 64 cause we
tend to construct agent names that might be longer then 32
since they are based on real vnames (lan0, node0, etc).
alter table eventlist change vname \
vname varchar(64) NOT NULL default '';
Make equiv change in virt_agents table:
alter table virt_agents change vname \
vname varchar(64) NOT NULL default '';
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