Commit e19449fd authored by Mike Hibler's avatar Mike Hibler
Browse files

Subtle change to the query that checks whether a node's OS supports linktest:

change the query to check nodes.node_id instead of nodes.phys_nodeid against
the reserved.node_id.

This means the query now returns FBSD-JAIL for vnodes rather than NULL
for the OS.  I ran the query against every current experiment in the DB
and the only other changes were:

  * plab nodes return RHL_PLAB instead of NULL.  As long as linktest is
    not an osfeature of that image (it isn't) then this fix is compatible

  * pc2000s, which host IXPs, now only return one row in the query.
    Previously they would return a row for "pc17X" and for "ixpN".
    This is probably not what we wanted anyway.
parent 8434f071
#!/usr/bin/perl -wT
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2005 University of Utah and the Flux Group.
# Copyright (c) 2000-2006 University of Utah and the Flux Group.
# All rights reserved.
#
use English;
......@@ -250,7 +250,7 @@ $query_result =
" from virt_nodes as v ".
"left join reserved as r on r.pid=v.pid and ".
" r.eid=v.eid and r.vname=v.vname ".
"left join nodes as n on n.phys_nodeid=r.node_id ".
"left join nodes as n on n.node_id=r.node_id ".
"left join os_info as o on o.osid=n.def_boot_osid ".
"where v.pid='$pid' and v.eid='$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