Fix to HasVirtualNodes(); must join with the reserved table.

506d7f04 · Leigh B Stoller · b314d660 · 506d7f04
Commit 506d7f04 authored Sep 22, 2011 by Leigh B Stoller
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

db/Node.pm.in db/Node.pm.in +5 -2

No files found.
--- a/db/Node.pm.in
+++ b/db/Node.pm.in
@@ -1267,8 +1267,11 @@ sub HasVirtualNodes($)
    my $node_id = $self->node_id();

    my $query_result = 
-	DBQueryWarn("select node_id from nodes ".
-		    "where phys_nodeid='$node_id' and node_id!=phys_nodeid");
+	DBQueryWarn("select nodes.node_id from nodes ".
+		    "left join reserved on reserved.node_id=nodes.node_id ".
+		    "where nodes.phys_nodeid='$node_id' and ".
+		    "      nodes.node_id!=nodes.phys_nodeid and ".
+		    "      reserved.node_id is not null");
    return -1
 	if (!$query_result);