Commit 283e27fd authored by Leigh Stoller's avatar Leigh Stoller

Part of my changes to support swapmod of ElabInElab experiments. I needed

to get this change in cause it also includes some DHCPD conf changes and
Mike and I were messing each other up.

* The DHCPD change is that instead of using reserved.inner_elab_role
  as the flag to indicate a node should boot inside or outside, I
  added inner_elab_boot, which is a boolean that I set when its
  actually time to do this. This avoids two ElabInElab swapins at the
  same time from messing each other up! Basically avoids the obvious
  race.

* The rest of the changes are for swapmod itself, which are incomplete
  but should be harmless until the rest of the stuff is ready.
parent 3abcc463
#!/usr/bin/perl -wT
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004 University of Utah and the Flux Group.
# Copyright (c) 2000-2005 University of Utah and the Flux Group.
# All rights reserved.
#
use English;
......@@ -173,7 +173,8 @@ while (<IF>) {
my $nodetype = $2;
my $query_result =
DBQueryWarn("select n.node_id,i.IP,i.MAC,r.pid,r.eid, ".
" r.vname,r.inner_elab_role ".
" r.vname,r.inner_elab_role, ".
" r.inner_elab_boot ".
"from nodes as n ".
"left join interfaces as i on ".
" n.node_id=i.node_id ".
......@@ -219,6 +220,7 @@ while (<IF>) {
}
if (defined($row{"pid"}) &&
$row{"inner_elab_boot"} == 1 &&
defined($row{"inner_elab_role"}) &&
$row{"inner_elab_role"} eq "node") {
my $tag = $row{"pid"} . ":" . $row{"eid"};
......
This diff is collapsed.
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