Commit babaf94d authored by Leo Gordon's avatar Leo Gordon
Browse files

removed the input_id functionality from runWorker as both redundant...

removed the input_id functionality from runWorker as both redundant (standaloneJob) and probably not working
parent 0af4855d
......@@ -112,11 +112,11 @@ sub create_new_worker {
my ($self, @args) = @_;
my ( $meadow_type, $meadow_name, $process_id, $exec_host,
$rc_id, $rc_name, $analysis_id, $logic_name, $job_id, $input_id,
$rc_id, $rc_name, $analysis_id, $logic_name, $job_id,
$no_write, $debug, $worker_log_dir, $hive_log_dir, $job_limit, $life_span, $no_cleanup, $retry_throwing_jobs, $compile_module_once) =
rearrange([qw(meadow_type meadow_name process_id exec_host
rc_id rc_name analysis_id logic_name job_id input_id
rc_id rc_name analysis_id logic_name job_id
no_write debug worker_log_dir hive_log_dir job_limit life_span no_cleanup retry_throwing_jobs compile_module_once) ], @args);
if($rc_name) {
......@@ -143,24 +143,6 @@ sub create_new_worker {
my $job;
if($input_id) {
if($job_id) {
die "You should either define -input_id or -job_id, but not both\n";
} elsif($analysis_id) {
$job = Bio::EnsEMBL::Hive::AnalysisJob->new(
-INPUT_ID => $input_id,
-ANALYSIS_ID => $analysis_id,
-DBID => -1,
);
print "creating a job outside the database\n";
$job->print_job;
$debug=1 unless(defined($debug));
} else {
die "For creating a job outside the database either -analysis_id or -logic_name must also be defined\n";
}
}
if($job_id) {
if($analysis_id) {
die "When you specify -job_id, please omit both -logic_name and -analysis_id to avoid confusion\n";
......
......@@ -20,7 +20,7 @@ my $db_conf = {
};
my ($reg_conf, $reg_alias, $url); # Connection parameters
my ($rc_id, $rc_name, $analysis_id, $logic_name, $job_id, $input_id); # Task specification parameters
my ($rc_id, $rc_name, $analysis_id, $logic_name, $job_id); # Task specification parameters
my ($job_limit, $life_span, $no_cleanup, $no_write, $hive_log_dir, $worker_log_dir, $retry_throwing_jobs, $compile_module_once); # Worker control parameters
my ($help, $debug);
......@@ -42,7 +42,6 @@ GetOptions(
'analysis_id=i' => \$analysis_id,
'logic_name=s' => \$logic_name,
'job_id=i' => \$job_id,
'input_id=s' => \$input_id,
# Worker control parameters:
'job_limit|limit=i' => \$job_limit,
......@@ -107,7 +106,6 @@ eval {
-analysis_id => $analysis_id,
-logic_name => $logic_name,
-job_id => $job_id,
-input_id => $input_id,
# Worker control parameters:
-job_limit => $job_limit,
......@@ -171,9 +169,6 @@ __DATA__
# Run a specific job (by a local worker process):
runWorker.pl -url mysql://username:secret@hostname:port/ehive_dbname -job_id 123456
# Create a job outside the eHive to test the specified input_id
runWorker.pl -url mysql://username:secret@hostname:port/ehive_dbname -logic_name fast_blast -input_id '{ "foo" => 1500 }'
=head1 OPTIONS
=head2 Connection parameters:
......@@ -195,7 +190,6 @@ __DATA__
-analysis_id <id> : pre-specify this worker in a particular analysis defined by database id
-logic_name <string> : pre-specify this worker in a particular analysis defined by name
-job_id <id> : run a specific job defined by its database id
-input_id <string> : test this input_id on specified analysis (defined either by analysis_id or logic_name)
=head2 Worker control parameters:
......
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