Remove query execution from runner.pl
This commit is contained in:
@@ -10,7 +10,6 @@ use FindBin;
|
|||||||
use lib "$FindBin::Bin/../../scripts/Modules";
|
use lib "$FindBin::Bin/../../scripts/Modules";
|
||||||
use lib "$FindBin::Bin/Modules";
|
use lib "$FindBin::Bin/Modules";
|
||||||
|
|
||||||
use Filters;
|
|
||||||
use Util;
|
use Util;
|
||||||
|
|
||||||
use feature 'say';
|
use feature 'say';
|
||||||
@@ -272,33 +271,6 @@ sub inject {
|
|||||||
waitpid( $pid, 0 );
|
waitpid( $pid, 0 );
|
||||||
}
|
}
|
||||||
|
|
||||||
sub results {
|
|
||||||
my ($experiment) = @_;
|
|
||||||
|
|
||||||
my @queries =
|
|
||||||
map { s/\.pm//gr } Util::find_files("$remote_root/scripts/Queries");
|
|
||||||
|
|
||||||
# Filters are combined into one
|
|
||||||
my @configs = Filters::get_default_configs();
|
|
||||||
|
|
||||||
# Keep trying even if a single query fails
|
|
||||||
for my $query (@queries) {
|
|
||||||
eval {
|
|
||||||
# Remote results stay in the experiment dir so they are archived
|
|
||||||
my $experiment_dir = "$remote_builds_dir/$experiment";
|
|
||||||
|
|
||||||
Util::execute_query( $experiment, $query,
|
|
||||||
$remote_db_conf, $experiment_dir, $experiment_dir, "", 1,
|
|
||||||
@configs );
|
|
||||||
1;
|
|
||||||
} or do {
|
|
||||||
my $error = $@ || 'bullshit error';
|
|
||||||
chomp $error;
|
|
||||||
warn "Query $query failed for $experiment: $error\n";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# Run single experiment passed as argument
|
# Run single experiment passed as argument
|
||||||
my $experiment = $ARGV[0] or die "Usage: runner.pl <experiment>\n";
|
my $experiment = $ARGV[0] or die "Usage: runner.pl <experiment>\n";
|
||||||
Util::rewrite_file( $remote_db_conf, "database=",
|
Util::rewrite_file( $remote_db_conf, "database=",
|
||||||
@@ -311,6 +283,5 @@ sleep(10);
|
|||||||
trace($experiment);
|
trace($experiment);
|
||||||
import_trace($experiment);
|
import_trace($experiment);
|
||||||
inject($experiment);
|
inject($experiment);
|
||||||
results($experiment);
|
|
||||||
|
|
||||||
Util::notify("Finished experiment $experiment");
|
Util::notify("Finished experiment $experiment");
|
||||||
|
|||||||
Reference in New Issue
Block a user