Commit 2c0d82a5 authored by Ryan Jackson's avatar Ryan Jackson

Enable new event scheduler

Use the new event scheduler by default for any
users/groups/experiments configured for it using EmulabFeatures.

Added '-N' option to eventsys.proxy to have it use the new scheduler
(if it exists) instead of the old one.

Added test for NewEventScheduler feature to eventsys_control so that
it will pass the '-N' option to eventsys.proxy for
experiments/users/groups using the feature.

These changes will go away when the new event scheduler replaces the
old one.
parent b5ca3512
......@@ -2143,6 +2143,7 @@ else
event/etc/elvind-boss.conf event/etc/elvind-ops.conf \
event/etc/elvind-inetd.conf event/etc/GNUmakefile\
event/sched/GNUmakefile \
event/new_sched/GNUmakefile \
event/tbgen/GNUmakefile \
event/example/GNUmakefile event/example/tbsend.pl \
event/example/tbrecv.pl event/example/tbsend-short.pl \
......
......@@ -691,6 +691,7 @@ else
event/etc/elvind-boss.conf event/etc/elvind-ops.conf \
event/etc/elvind-inetd.conf event/etc/GNUmakefile\
event/sched/GNUmakefile \
event/new_sched/GNUmakefile \
event/tbgen/GNUmakefile \
event/example/GNUmakefile event/example/tbsend.pl \
event/example/tbrecv.pl event/example/tbsend-short.pl \
......
......@@ -25,7 +25,7 @@ sub usage()
"-l logfile -t record_file start|stop|replay\n";
exit(-1);
}
my $optlist = "u:e:k:dl:g:t:a";
my $optlist = "u:e:k:dl:g:t:aN";
my $debug = 0;
my $runagent= 0;
my $user;
......@@ -106,6 +106,9 @@ if (defined($options{"a"})) {
if (defined($options{"t"})) {
$recordfile = $options{"t"};
}
if (defined($options{"N"})) {
$sched = "$TB/sbin/new-event-sched";
}
$logfile = $options{"l"};
$keyfile = $options{"k"};
......
......@@ -64,6 +64,7 @@ use libtestbed;
use libtblog;
use Experiment;
use User;
use EmulabFeatures;
#
# Turn off line buffering on output
......@@ -193,6 +194,12 @@ if (!defined($group)) {
# flip back.
#
my $cmd = $proxy;
if (EmulabFeatures->FeatureEnabled("NewScheduler", $this_user, $group,
$experiment)) {
$cmd .= " -N ";
}
$cmd .= " -d"
if ($debug);
$cmd .= " -a"
......
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