diff --git a/contribs/perlapi/libslurm/perl/Slurm.xs b/contribs/perlapi/libslurm/perl/Slurm.xs index 9a279f190bb6ede0ee1c166c4f01eb8d2d3c636e..4ac52412660e1dd9151f1912abb9028b47788a13 100644 --- a/contribs/perlapi/libslurm/perl/Slurm.xs +++ b/contribs/perlapi/libslurm/perl/Slurm.xs @@ -573,11 +573,6 @@ slurm_complete_job(slurm_t self, uint32_t job_id, uint32_t job_rc=0) C_ARGS: job_id, job_rc -int -slurm_terminate_job(slurm_t self, uint32_t job_id) - C_ARGS: - job_id - int slurm_terminate_job_step(slurm_t self, uint32_t job_id, uint32_t step_id) C_ARGS: diff --git a/contribs/perlapi/libslurm/perl/lib/Slurm.pm b/contribs/perlapi/libslurm/perl/lib/Slurm.pm index 67f9f11fef405798bf4017de924bdf3ab2808dc8..7fa28654f98d3a53f3b876b709f8e333b0c6ef6d 100644 --- a/contribs/perlapi/libslurm/perl/lib/Slurm.pm +++ b/contribs/perlapi/libslurm/perl/lib/Slurm.pm @@ -578,18 +578,6 @@ Note the completion of a job and all of its steps. =back -=head3 $rc = $slurm->terminate_job($job_id); - -Terminates all steps of an existing job by sending a REQUEST_TERMINATE_JOB rpc to all slurmd in the the job allocation, and then calls slurm_complete_job(). - -=over 2 - -=item * IN $job_id: the job's id. - -=item * RET: 0 on success, otherwise return -1 and set errno to indicate the error. - -=back - =head3 $rc = $slurm->terminate_job_step($job_id, $step_id); Terminates a job step by sending a REQUEST_TERMINATE_TASKS rpc to all slurmd of a job step, and then calls slurm_complete_job_step() after verifying that all nodes in the job step no longer have running tasks from the job step. (May take over 35 seconds to return.) diff --git a/contribs/perlapi/libslurm/perl/t/06-complete.t b/contribs/perlapi/libslurm/perl/t/06-complete.t index f18eebad70d4aa51adcd4e79e064d1f87f62959d..ae8e3ae6f902ddb8228a70bb499b5bf3e6a4dccb 100644 --- a/contribs/perlapi/libslurm/perl/t/06-complete.t +++ b/contribs/perlapi/libslurm/perl/t/06-complete.t @@ -1,5 +1,5 @@ #!/usr/bin/perl -T -use Test::More tests => 5; +use Test::More tests => 4; use Slurm qw(:constant); use POSIX qw(:signal_h); @@ -24,7 +24,7 @@ ok($resp, "submit batch job") or diag ("submit_batch_job: " . $slurm->strerror() $jobid = $resp->{job_id} if $resp; -# 3 - 5 +# 3 - 4 SKIP: { skip "no job", 4 unless $jobid; @@ -34,10 +34,6 @@ SKIP: { $rc = $slurm->terminate_job_step($jobid, 0); ok($rc == SLURM_SUCCESS || $slurm->get_errno() == ESLURM_ALREADY_DONE, "termite job step") or diag("terminate_job_step: " . $slurm->strerror()); - - $rc = $slurm->terminate_job($jobid); - ok($rc == SLURM_SUCCESS || $slurm->get_errno() == ESLURM_ALREADY_DONE, "terminate job") - or diag("terminate_job: " . $slurm->strerror()); } $slurm->kill_job($jobid, SIGKILL) if $jobid;