Commit 1e7ba41c authored by Leigh B. Stoller's avatar Leigh B. Stoller
Browse files

Clear out some shark stuff.

parent 6985abfe
...@@ -266,19 +266,13 @@ foreach my $n (@freed_nodes) { ...@@ -266,19 +266,13 @@ foreach my $n (@freed_nodes) {
next; next;
} }
# Clean up interfaces by clearing IPs and/or aliases. if (! $isvirt) {
if (! ($n =~ /sh\d+/)) { # On real nodes, clean out all interfaces except the control net.
# Its not a shark, so clean out all IPs except the control net.
DBQueryWarn("update interfaces set IP='',IPaliases=NULL,mask=NULL,". DBQueryWarn("update interfaces set IP='',IPaliases=NULL,mask=NULL,".
" rtabid='0',vnode_id=NULL,current_speed='0' ". " rtabid='0',vnode_id=NULL,current_speed='0' ".
"where node_id='$n' and ". "where node_id='$n' and ".
" role='" . TBDB_IFACEROLE_EXPERIMENT() . "'") " role='" . TBDB_IFACEROLE_EXPERIMENT() . "'")
|| $error++; || $error++;
} else {
# XXX Shark Hack!
DBQueryWarn("update interfaces set IPalias='',rtabid='0', ".
" vnode_id=NULL ".
"where node_id='$n'") || $error++;
} }
my $allocFreeState = TBDB_ALLOCSTATE_FREE_DIRTY(); my $allocFreeState = TBDB_ALLOCSTATE_FREE_DIRTY();
......
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