Commit 128cc364 authored by Mac Newbold's avatar Mac Newbold
Browse files

Fix bug that wasn't sending swap requests to expts that were idleswappable and unswappable

parent 05c5d371
...@@ -135,11 +135,12 @@ last_cpu_act, last_ext_act)) as lastact, ...@@ -135,11 +135,12 @@ last_cpu_act, last_ext_act)) as lastact,
from node_activity as na left join reserved as r on na.node_id=r.node_id from node_activity as na left join reserved as r on na.node_id=r.node_id
left join experiments as e on r.pid=e.pid and r.eid=e.eid left join experiments as e on r.pid=e.pid and r.eid=e.eid
where r.pid is not null and r.eid is not null and idle_ignore=0 where r.pid is not null and r.eid is not null and idle_ignore=0
and idleswap=0 and (idleswap=0 or swappable=0)
group by pid,eid having idle_time >= $threshold and nodes > 0 group by pid,eid having idle_time >= $threshold and nodes > 0
order by pid,eid order by pid,eid
EOT EOT
# We don't want idleswappable ones, since they get a different warning # We don't want idleswappable ones, since they get a different warning
# unless they're unswappable.
$q = DBQueryFatal($sql); $q = DBQueryFatal($sql);
......
Supports Markdown
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