All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit 42764808 authored by Mac Newbold's avatar Mac Newbold

Add idle_ignore column to db. Makes idlecheck completely ignore it when...

Add idle_ignore column to db. Makes idlecheck completely ignore it when looking for idle expts. Unswappable expts still get checked and possibly harassed if they go idle.
parent cebe5c0a
...@@ -161,7 +161,7 @@ my @list=(); ...@@ -161,7 +161,7 @@ my @list=();
$cmd = "select r.pid,r.eid,swappable,expt_swapped from reserved as r $cmd = "select r.pid,r.eid,swappable,expt_swapped from reserved as r
left join experiments as e on e.pid=r.pid and e.eid=r.eid left join experiments as e on e.pid=r.pid and e.eid=r.eid
where (unix_timestamp(now())-unix_timestamp(expt_swapped) >= $idlesec) where (unix_timestamp(now())-unix_timestamp(expt_swapped) >= $idlesec)
group by r.pid,r.eid order by r.pid,r.eid"; and idle_ignore=0 group by r.pid,r.eid order by r.pid,r.eid";
print "Sending cmd:\n$cmd\n" if $d; print "Sending cmd:\n$cmd\n" if $d;
$result = DBQueryFatal($cmd); $result = DBQueryFatal($cmd);
while(@r=$result->fetchrow()) { while(@r=$result->fetchrow()) {
......
...@@ -184,6 +184,7 @@ CREATE TABLE experiments ( ...@@ -184,6 +184,7 @@ CREATE TABLE experiments (
wa_plr_solverweight float default '0', wa_plr_solverweight float default '0',
swap_requests tinyint(4) NOT NULL default '0', swap_requests tinyint(4) NOT NULL default '0',
last_swap_req datetime default NULL, last_swap_req datetime default NULL,
idle_ignore tinyint(4) NOT NULL default '0',
PRIMARY KEY (eid,pid) PRIMARY KEY (eid,pid)
) TYPE=MyISAM; ) TYPE=MyISAM;
......
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