Commit 00acc3d2 authored by Mike Hibler's avatar Mike Hibler

Don't subscribe to event scheduler events.

parent f495b7c0
#!/usr/bin/perl -w
#
# Copyright (c) 2004-2014, 2016 University of Utah and the Flux Group.
# Copyright (c) 2004-2017 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -418,7 +418,9 @@ sub doboot()
elsif (!(REMOTE() && !REMOTEDED()) && !GENVNODE()) {
#
# We run pubsubd in clustering mode, asking for just notifications
# for the current experiment.
# for the current experiment. Note that we explicitly exclude those
# intended for the event scheduler running on ops. In theory, they
# should not cause problems, but they are confusing at best.
#
my $eventserver = "event-server";
if (REMOTE()) {
......@@ -428,7 +430,7 @@ sub doboot()
open(CONF, "> $PUBSUBEXPR") or
fatal("Error opening $PUBSUBEXPR for writing");
print CONF "(EXPT == \"$pid/$eid\")\n";
print CONF "(EXPT == \"$pid/$eid\") && SCHEDULER == 0\n";
close(CONF);
}
if (defined($clusteringoptions)) {
......
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