Commit 2dac966b authored by Shashi Guruprasad's avatar Shashi Guruprasad
Browse files

Added old_pid,old_eid in the reserved table to support moving vnodes

from one pnode to another during a swapmod.
parent c650c97c
...@@ -1153,8 +1153,11 @@ CREATE TABLE reserved ( ...@@ -1153,8 +1153,11 @@ CREATE TABLE reserved (
vname varchar(32) default NULL, vname varchar(32) default NULL,
erole enum('node','virthost','delaynode','simhost') NOT NULL default 'node', erole enum('node','virthost','delaynode','simhost') NOT NULL default 'node',
simhost_violation tinyint(3) unsigned NOT NULL default '0', simhost_violation tinyint(3) unsigned NOT NULL default '0',
old_pid varchar(12) NOT NULL default '',
old_eid varchar(32) NOT NULL default '',
PRIMARY KEY (node_id), PRIMARY KEY (node_id),
UNIQUE KEY vname (pid,eid,vname) UNIQUE KEY vname (pid,eid,vname),
KEY old_pid (old_pid,old_eid)
) TYPE=MyISAM; ) TYPE=MyISAM;
-- --
......
...@@ -1259,5 +1259,19 @@ last_net_act,last_cpu_act,last_ext_act); ...@@ -1259,5 +1259,19 @@ last_net_act,last_cpu_act,last_ext_act);
NOT NULL default '1' after sim_reswap_count; NOT NULL default '1' after sim_reswap_count;
alter table experiments add allowfixnode tinyint(4) \ alter table experiments add allowfixnode tinyint(4) \
not null default 1 after veth_encapsulate; not null default 0 after veth_encapsulate;
1.221: Fixed allowfixnode to default to 1 instead of 0
alter table experiments change allowfixnode allowfixnode tinyint(4) \
not null default 1;
1.222: Added old_pid and old_eid in reserved table. This allows the moving of
current reservations into a holding experiment with old_pid/old_eid
suitably filled during assign_wrapper. Eventually, any unused
entries will first be torn down and entries in the DB deleted.
alter table reserved add column old_pid varchar(12) NOT NULL default '', \
add column old_eid varchar(32) NOT NULL default '';
alter table reserved add KEY old_pid (old_pid,old_eid);
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