eval_failed event: change interface to traceID\tjobsetID
I was not going to break the interface until I noticed the other eval_* events used literal \ts
This commit is contained in:
@ -8,6 +8,7 @@ use Hydra::Event::BuildStarted;
|
||||
use Hydra::Event::CachedBuildFinished;
|
||||
use Hydra::Event::CachedBuildQueued;
|
||||
use Hydra::Event::EvalCached;
|
||||
use Hydra::Event::EvalFailed;
|
||||
use Hydra::Event::EvalStarted;
|
||||
use Hydra::Event::StepFinished;
|
||||
|
||||
@ -18,6 +19,7 @@ my %channels_to_events = (
|
||||
cached_build_finished => \&Hydra::Event::CachedBuildFinished::parse,
|
||||
cached_build_queued => \&Hydra::Event::CachedBuildQueued::parse,
|
||||
eval_cached => \&Hydra::Event::EvalCached::parse,
|
||||
eval_failed => \&Hydra::Event::EvalFailed::parse,
|
||||
eval_started => \&Hydra::Event::EvalStarted::parse,
|
||||
step_finished => \&Hydra::Event::StepFinished::parse,
|
||||
);
|
||||
|
53
src/lib/Hydra/Event/EvalFailed.pm
Normal file
53
src/lib/Hydra/Event/EvalFailed.pm
Normal file
@ -0,0 +1,53 @@
|
||||
package Hydra::Event::EvalFailed;
|
||||
|
||||
use strict;
|
||||
use warnings;
|
||||
|
||||
sub parse :prototype(@) {
|
||||
unless (@_ == 2) {
|
||||
die "eval_failed: payload takes two arguments, but ", scalar(@_), " were given";
|
||||
}
|
||||
|
||||
my ($trace_id, $jobset_id) = @_;
|
||||
|
||||
unless ($jobset_id =~ /^\d+$/) {
|
||||
die "eval_failed: payload argument should be an integer, but '", $jobset_id, "' was given"
|
||||
}
|
||||
|
||||
return Hydra::Event::EvalFailed->new($trace_id, int($jobset_id));
|
||||
}
|
||||
|
||||
sub new {
|
||||
my ($self, $trace_id, $jobset_id) = @_;
|
||||
return bless {
|
||||
"trace_id" => $trace_id,
|
||||
"jobset_id" => $jobset_id,
|
||||
"jobset" => undef
|
||||
}, $self;
|
||||
}
|
||||
|
||||
sub interestedIn {
|
||||
my ($self, $plugin) = @_;
|
||||
return int(defined($plugin->can('evalFailed')));
|
||||
}
|
||||
|
||||
sub load {
|
||||
my ($self, $db) = @_;
|
||||
|
||||
if (!defined($self->{"jobset"})) {
|
||||
$self->{"jobset"} = $db->resultset('Jobsets')->find({ id => $self->{"jobset_id"}})
|
||||
or die "Jobset $self->{'jobset_id'} does not exist\n";
|
||||
}
|
||||
}
|
||||
|
||||
sub execute {
|
||||
my ($self, $db, $plugin) = @_;
|
||||
|
||||
$self->load($db);
|
||||
|
||||
$plugin->evalFailed($self->{"trace_id"}, $self->{"jobset"});
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
1;
|
@ -42,6 +42,11 @@ sub instantiate {
|
||||
# my ($self, $traceID, $jobset, $evaluation) = @_;
|
||||
# }
|
||||
|
||||
# # Called when an evaluation of $jobset failed.
|
||||
# sub evalFailed {
|
||||
# my ($self, $traceID, $jobset) = @_;
|
||||
# }
|
||||
|
||||
# # Called when build $build has been queued.
|
||||
# sub buildQueued {
|
||||
# my ($self, $build) = @_;
|
||||
|
@ -654,7 +654,7 @@ sub checkJobsetWrapped {
|
||||
print STDERR $fetchError;
|
||||
$db->txn_do(sub {
|
||||
$jobset->update({ lastcheckedtime => time, fetcherrormsg => $fetchError }) if !$dryRun;
|
||||
$db->storage->dbh->do("notify eval_failed, ?", undef, join('\t', $tmpId));
|
||||
$db->storage->dbh->do("notify eval_failed, ?", undef, join("\t", $tmpId, $jobset->get_column('id')));
|
||||
});
|
||||
return;
|
||||
}
|
||||
@ -882,7 +882,7 @@ sub checkJobset {
|
||||
$db->txn_do(sub {
|
||||
$jobset->update({lastcheckedtime => $eventTime});
|
||||
setJobsetError($jobset, $checkError, $eventTime);
|
||||
$db->storage->dbh->do("notify eval_failed, ?", undef, join('\t', $tmpId));
|
||||
$db->storage->dbh->do("notify eval_failed, ?", undef, join("\t", $tmpId, $jobset->get_column('id')));
|
||||
}) if !$dryRun;
|
||||
$failed = 1;
|
||||
}
|
||||
|
@ -99,6 +99,7 @@ $listener->subscribe("build_started");
|
||||
$listener->subscribe("cached_build_finished");
|
||||
$listener->subscribe("cached_build_queued");
|
||||
$listener->subscribe("eval_cached");
|
||||
$listener->subscribe("eval_failed");
|
||||
$listener->subscribe("eval_started");
|
||||
$listener->subscribe("hydra_notify_dump_metrics");
|
||||
$listener->subscribe("step_finished");
|
||||
|
Reference in New Issue
Block a user