Hydra/28: Rename "scheduler" to "evaluator"

This commit is contained in:
Rob Vermaas 2010-05-11 11:10:03 +00:00
parent 4550ced942
commit 001113f7f9
4 changed files with 11 additions and 11 deletions

View file

@ -67,7 +67,7 @@
- Create a project, jobset etc. - Create a project, jobset etc.
- Start hydra_scheduler and hydra_runner - Start hydra_evaluator and hydra_queue_runner
* Upgrade notes: * Upgrade notes:

View file

@ -59,7 +59,7 @@ sub updateView {
unless $view->project->jobsets->find({name => $jobsetName}); unless $view->project->jobsets->find({name => $jobsetName});
# !!! We could check whether the job exists, but that would # !!! We could check whether the job exists, but that would
# require the scheduler to have seen the job, which may not be # require the evaluator to have seen the job, which may not be
# the case. # the case.
$view->viewjobs->create( $view->viewjobs->create(

View file

@ -12,8 +12,8 @@ if test "$action" = "start"; then
hydra_server.pl > $HYDRA_DATA/server.log 2>&1 & hydra_server.pl > $HYDRA_DATA/server.log 2>&1 &
echo $! > $HYDRA_DATA/server.pid echo $! > $HYDRA_DATA/server.pid
hydra_scheduler.pl > $HYDRA_DATA/scheduler.log 2>&1 & hydra_evaluator.pl > $HYDRA_DATA/evaluator.log 2>&1 &
echo $! > $HYDRA_DATA/scheduler.pid echo $! > $HYDRA_DATA/evaluator.pid
hydra_queue_runner.pl > $HYDRA_DATA/queue_runner.log 2>&1 & hydra_queue_runner.pl > $HYDRA_DATA/queue_runner.log 2>&1 &
echo $! > $HYDRA_DATA/queue_runner.pid echo $! > $HYDRA_DATA/queue_runner.pid
@ -21,7 +21,7 @@ if test "$action" = "start"; then
elif test "$action" = "stop"; then elif test "$action" = "stop"; then
kill $(cat $HYDRA_DATA/server.pid) kill $(cat $HYDRA_DATA/server.pid)
kill $(cat $HYDRA_DATA/scheduler.pid) kill $(cat $HYDRA_DATA/evaluator.pid)
kill $(cat $HYDRA_DATA/queue_runner.pid) kill $(cat $HYDRA_DATA/queue_runner.pid)
elif test "$action" = "status"; then elif test "$action" = "status"; then
@ -29,8 +29,8 @@ elif test "$action" = "status"; then
echo -n "Hydra web server... " echo -n "Hydra web server... "
(kill -0 $(cat $HYDRA_DATA/server.pid) 2> /dev/null && echo "ok") || echo "not running" (kill -0 $(cat $HYDRA_DATA/server.pid) 2> /dev/null && echo "ok") || echo "not running"
echo -n "Hydra scheduler... " echo -n "Hydra evaluator... "
(kill -0 $(cat $HYDRA_DATA/scheduler.pid) 2> /dev/null && echo "ok") || echo "not running" (kill -0 $(cat $HYDRA_DATA/evaluator.pid) 2> /dev/null && echo "ok") || echo "not running"
echo -n "Hydra queue runner... " echo -n "Hydra queue runner... "
(kill -0 $(cat $HYDRA_DATA/queue_runner.pid) 2> /dev/null && echo "ok") || echo "not running" (kill -0 $(cat $HYDRA_DATA/queue_runner.pid) 2> /dev/null && echo "ok") || echo "not running"

View file

@ -45,7 +45,7 @@ create table Jobsets (
nixExprPath text not null, -- relative path of the Nix expression nixExprPath text not null, -- relative path of the Nix expression
errorMsg text, -- used to signal the last evaluation error etc. for this jobset errorMsg text, -- used to signal the last evaluation error etc. for this jobset
errorTime integer, -- timestamp associated with errorMsg errorTime integer, -- timestamp associated with errorMsg
lastCheckedTime integer, -- last time the scheduler looked at this jobset lastCheckedTime integer, -- last time the evaluator looked at this jobset
enabled integer not null default 1, enabled integer not null default 1,
enableEmail integer not null default 1, enableEmail integer not null default 1,
emailOverride text not null, emailOverride text not null,
@ -100,8 +100,8 @@ create table Jobs (
errorMsg text, -- evalution error for this job errorMsg text, -- evalution error for this job
firstEvalTime integer, -- first time the scheduler saw this job firstEvalTime integer, -- first time the evaluator saw this job
lastEvalTime integer, -- last time the scheduler saw this job lastEvalTime integer, -- last time the evaluator saw this job
disabled integer not null default 0, -- !!! not currently used disabled integer not null default 0, -- !!! not currently used
@ -432,7 +432,7 @@ create table JobsetEvals (
hasNewBuilds integer not null, hasNewBuilds integer not null,
-- Used to prevent repeated Nix expression evaluation for the same -- Used to prevent repeated Nix expression evaluation for the same
-- set of inputs for a jobset. In the scheduler, after obtaining -- set of inputs for a jobset. In the evaluator, after obtaining
-- the current inputs for a jobset, we hash the inputs together, -- the current inputs for a jobset, we hash the inputs together,
-- and if the resulting hash already appears in this table, we can -- and if the resulting hash already appears in this table, we can
-- skip the jobset. Otherwise we proceed. The hash is computed -- skip the jobset. Otherwise we proceed. The hash is computed