Commit 8b4da64f authored by Jonathon Duerig's avatar Jonathon Duerig

Removed reserved_pid hack. -g now prunes by default. Use -a as well to send all nodes.

parent c4f2dd9c
...@@ -458,16 +458,6 @@ if (defined($exempt_eid)) { ...@@ -458,16 +458,6 @@ if (defined($exempt_eid)) {
"(b.pid='$pid' and b.eid='$exempt_eid'))"; "(b.pid='$pid' and b.eid='$exempt_eid'))";
} }
# In genimode exclude nodes with exclusion attribute.
if ($genimode) {
$free_condition = "(nat1.attrvalue is null or nat1.attrvalue=0)";
if ($pid && $MAINSITE) {
$free_condition = "($free_condition and ".
"(np.reserved_pid is not null and np.reserved_pid='$pid'))";
}
}
# In shared mode, allow allocated nodes whose sharing_mode is set. # In shared mode, allow allocated nodes whose sharing_mode is set.
if ($useshared) { if ($useshared) {
$free_condition = "($free_condition or ". $free_condition = "($free_condition or ".
...@@ -481,6 +471,12 @@ if ($allnodes) { ...@@ -481,6 +471,12 @@ if ($allnodes) {
$free_condition = "1"; $free_condition = "1";
} }
# In genimode exclude nodes with exclusion attribute.
if ($genimode) {
$free_condition = "($free_condition and ".
"(nat1.attrvalue is null or nat1.attrvalue=0))";
}
$result = $result =
DBQueryFatal("select a.node_id,a.type,a.phys_nodeid,t.class,t.issubnode," . DBQueryFatal("select a.node_id,a.type,a.phys_nodeid,t.class,t.issubnode," .
"a.def_boot_osid,(b.pid is not null and b.eid is not null), ". "a.def_boot_osid,(b.pid is not null and b.eid is not null), ".
......
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