Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
emulab-devel
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
143
Issues
143
List
Boards
Labels
Service Desk
Milestones
Merge Requests
6
Merge Requests
6
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
emulab
emulab-devel
Commits
c1ae4f06
Commit
c1ae4f06
authored
Aug 18, 2017
by
Leigh B Stoller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove card,port from virt_node_public_addr, does not appear to be used.
parent
5ea29f4b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
6 deletions
+24
-6
db/Node.pm.in
db/Node.pm.in
+4
-4
sql/database-create.sql
sql/database-create.sql
+0
-2
sql/updates/4/597
sql/updates/4/597
+20
-0
No files found.
db/Node.pm.in
View file @
c1ae4f06
...
...
@@ -2628,7 +2628,7 @@ sub CreateVnodes($$$)
( $jailip, $jailmask ) = $query_result->fetchrow_array();
DBQueryFatal( "UPDATE virt_node_public_addr SET " .
"node_id='
$
vnodeid
'
, card='
0
', port='
1
'
" .
"node_id='
$
vnodeid
' " .
"WHERE IP='
$
jailip
'" )
if (!$impotent);
} else {
...
...
@@ -2856,7 +2856,7 @@ sub CreateVnodes($$$)
}
foreach my $vnodeid (@created) {
DBQueryWarn("update virt_node_public_addr set ".
" node_id=NULL
,card='
0
',port='
0
'
".
" node_id=NULL ".
"where node_id='
$
vnodeid
'");
DBQueryWarn("delete from reserved where node_id='
$
vnodeid
'");
DBQueryWarn("delete from nodes where node_id='
$
vnodeid
'");
...
...
@@ -2892,7 +2892,7 @@ sub DeleteVnodes(@)
$interface->Delete();
}
DBQueryWarn("update virt_node_public_addr set ".
" node_id=NULL
,card='
0
',port='
0
'
".
" node_id=NULL ".
"where node_id='
$
vnodeid
'");
DBQueryWarn("delete from node_bootlogs where node_id='
$
vnodeid
'");
...
...
@@ -3793,7 +3793,7 @@ sub GetJailIP($;$)
my
$
node_id
=
$
self
->
node_id
();
my
$
query_result
=
DBQueryWarn
(
"SELECT IP, mask FROM virt_node_public_addr WHERE "
.
"node_id='$node_id'
AND card='0' AND port='1'
"
);
"node_id='$node_id'"
);
if
(
$
query_result
&&
$
query_result
->
numrows
)
{
#
we
've assigned a public address to this one
...
...
sql/database-create.sql
View file @
c1ae4f06
...
...
@@ -5688,8 +5688,6 @@ CREATE TABLE `virt_node_public_addr` (
`IP`
varchar
(
15
)
NOT
NULL
default
''
,
`mask`
varchar
(
15
)
default
NULL
,
`node_id`
varchar
(
32
)
default
NULL
,
`card`
tinyint
(
3
)
unsigned
default
'0'
,
`port`
smallint
(
5
)
unsigned
default
'0'
,
`pool_id`
varchar
(
32
)
default
NULL
,
`pid`
varchar
(
48
)
default
NULL
,
`eid`
varchar
(
32
)
default
NULL
,
...
...
sql/updates/4/597
0 → 100644
View file @
c1ae4f06
use strict;
use libdb;
use emdb;
sub DoUpdate($$$)
{
my ($dbhandle, $dbname, $version) = @_;
if (DBSlotExists("virt_node_public_addr", "card")) {
DBQueryFatal("alter table virt_node_public_addr drop card");
}
if (DBSlotExists("virt_node_public_addr", "port")) {
DBQueryFatal("alter table virt_node_public_addr drop port");
}
return 0;
}
# Local Variables:
# mode:perl
# End:
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment