All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit 182ee5a4 authored by Mike Hibler's avatar Mike Hibler

1.284: Fix a firewall botch (see 1.279). Should have placed the cnet_vlan

       column in the reserved table and not the nodes table:

Also fix a cut/paste error and renumbed some items, we went from 1.279 to
1.270 and started counting up again.
parent aeaac38f
...@@ -1065,7 +1065,6 @@ CREATE TABLE nodes ( ...@@ -1065,7 +1065,6 @@ CREATE TABLE nodes (
stated_tag varchar(32) default NULL, stated_tag varchar(32) default NULL,
rtabid smallint(5) unsigned NOT NULL default '0', rtabid smallint(5) unsigned NOT NULL default '0',
cd_version varchar(32) default NULL, cd_version varchar(32) default NULL,
cnet_vlan int(11) default NULL,
PRIMARY KEY (node_id), PRIMARY KEY (node_id),
KEY phys_nodeid (phys_nodeid), KEY phys_nodeid (phys_nodeid),
KEY node_id (node_id,phys_nodeid), KEY node_id (node_id,phys_nodeid),
...@@ -1364,6 +1363,7 @@ CREATE TABLE reserved ( ...@@ -1364,6 +1363,7 @@ CREATE TABLE reserved (
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_pid varchar(12) NOT NULL default '',
old_eid varchar(32) NOT NULL default '', old_eid varchar(32) NOT NULL default '',
cnet_vlan int(11) default NULL,
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) KEY old_pid (old_pid,old_eid)
......
...@@ -2099,14 +2099,14 @@ last_net_act,last_cpu_act,last_ext_act); ...@@ -2099,14 +2099,14 @@ last_net_act,last_cpu_act,last_ext_act);
alter table firewalls add index(vlan); alter table firewalls add index(vlan);
1.270: Add another role for interfaces; an outer control network role, 1.280: Add another role for interfaces; an outer control network role,
used for ElabinElab. used for ElabinElab.
alter table interfaces change role role \ alter table interfaces change role role \
enum('ctrl','expt','jail','fake','other','gw','outer_ctrl') \ enum('ctrl','expt','jail','fake','other','gw','outer_ctrl') \
default NULL; default NULL;
1.271: Add elabinelab_vlans table for mapping inner elab vlan ids to 1.281: Add elabinelab_vlans table for mapping inner elab vlan ids to
auto assigned outer elab vlan ids. auto assigned outer elab vlan ids.
CREATE TABLE elabinelab_vlans ( CREATE TABLE elabinelab_vlans (
...@@ -2117,11 +2117,27 @@ last_net_act,last_cpu_act,last_ext_act); ...@@ -2117,11 +2117,27 @@ last_net_act,last_cpu_act,last_ext_act);
PRIMARY KEY (pid,eid,inner_id) PRIMARY KEY (pid,eid,inner_id)
) TYPE=MyISAM; ) TYPE=MyISAM;
1.272: Add "archived" flag to webnews table for hiding entries. 1.282: Add "archived" flag to webnews table for hiding entries.
alter table webnews add archived tinyint(1) NOT NULL \ alter table webnews add archived tinyint(1) NOT NULL \
default '0' after body; default '0' after body;
alter table webnews add archived_date datetime default NULL \ alter table webnews add archived_date datetime default NULL \
after archived; after archived;
1.273: Fix errors in last revision; skip to next entry. 1.283: Fix errors in last revision; skip to next entry.
1.284: Fix a firewall botch (see 1.279). Should have placed the cnet_vlan
column in the reserved table and not the nodes table:
alter table reserved add cnet_vlan int(11) default NULL;
The nodes cnet_vlan column should be NULL for all nodes since
that column was never used before now. Verify this by doing:
select node_id from nodes where cnet_vlan is not null;
The select should return no rows. If it does, and you want to
save those values, copy all the non-NULL values from nodes to the
appropriate place in reserved. Then do:
alter table nodes drop column cnet_vlan;
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