Commit 3280ad68 authored by Timothy Stack's avatar Timothy Stack

Don't apply the policy of one batch experiment per-user / per-project

to experiments in 'emulab-ops' so the checkup_daemon can run more than
one thing at a time.
parent c16fb66c
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# #
# EMULAB-COPYRIGHT # 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. # All rights reserved.
# #
...@@ -73,6 +73,7 @@ my $BSTATE_TERMINATING = EXPTSTATE_TERMINATING; ...@@ -73,6 +73,7 @@ my $BSTATE_TERMINATING = EXPTSTATE_TERMINATING;
my $BSTATE_PAUSED = EXPTSTATE_SWAPPED; my $BSTATE_PAUSED = EXPTSTATE_SWAPPED;
my $BSTATE_LOCKED = BATCHSTATE_LOCKED; my $BSTATE_LOCKED = BATCHSTATE_LOCKED;
my $BSTATE_UNLOCKED = BATCHSTATE_UNLOCKED; my $BSTATE_UNLOCKED = BATCHSTATE_UNLOCKED;
my $TBOPSPID = TBOPSPID;
# #
# These are valid in the children, not the parent. I suppose I could use # These are valid in the children, not the parent. I suppose I could use
...@@ -178,7 +179,8 @@ while (1) { ...@@ -178,7 +179,8 @@ while (1) {
"left join experiments as e2 on ". "left join experiments as e2 on ".
" e2.expt_head_uid=e1.expt_head_uid and ". " e2.expt_head_uid=e1.expt_head_uid and ".
" e2.batchmode=1 and e2.state='$BSTATE_RUNNING' and ". " e2.batchmode=1 and e2.state='$BSTATE_RUNNING' and ".
" e1.pid=e2.pid and e1.eid!=e2.eid ". " e1.pid=e2.pid and e1.eid!=e2.eid and ".
" e2.pid!='$TBOPSPID' ".
"WHERE e2.eid is null and ". "WHERE e2.eid is null and ".
" e1.batchmode=1 and e1.canceled=0 and ". " e1.batchmode=1 and e1.canceled=0 and ".
" e1.expt_locked is null and ". " e1.expt_locked is null and ".
......
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