[Oar-commits] OAR branch 2.5 updated. 2.5.3+rc4-18-g987e782

Pierre Neyron neyron at ff-scm-v4-prod.irisa.fr
Mon Apr 29 17:44:27 CEST 2013


The branch, 2.5 has been updated
       via  987e782759a2ba9bea5895e92bba44b3ca7ae621 (commit)
      from  184346e57b46353c2c5dff8d1e1e3d1c5206d9fc (commit)


- Log -----------------------------------------------------------------
commit 987e782
Author: Pierre Neyron <pierre.neyron at imag.fr>
Date:   Mon Apr 29 17:43:26 2013 +0200

    [oardel] Fix option + improve usage & man
---
 sources/core/man/man1/oardel.pod |   20 ++++++++++----------
 sources/core/qfunctions/oardel   |   27 +++++++++++++--------------
 2 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/sources/core/man/man1/oardel.pod b/sources/core/man/man1/oardel.pod
index edf8351..078531d 100644
--- a/sources/core/man/man1/oardel.pod
+++ b/sources/core/man/man1/oardel.pod
@@ -4,11 +4,12 @@ oardel - delete or checkpoint job(s).
 
 =head1 SYNOPSIS
 
-B<oardel> [-c|-b|-s|--force-terminate-finishing-job][--array][job_ids][-h][-V]
+B<oardel> [options] <job_id> [job_id [...] ] 
+B<oardel> [options] --sql <SQL WHERE clause>
 
 =head1 DESCRIPTION
 
-This command is used to delete or checkpoint job(s). Jobs are designed by their number.
+This command can be used to delete or checkpoint job(s). Jobs are passed by id.
 
 =head1 OPTIONS
 
@@ -18,28 +19,27 @@ This command is used to delete or checkpoint job(s). Jobs are designed by their
 
 Send the checkpoint signal designed from the "--signal" oarsub command option (default is SIGUSR2) to the process launched by the job "job_id".
 
-=item B<-s, --signal>
+=item B<-s, --signal SIG>
 
-Send the signal given as parameter to the process launched by the job "job_id".
+Send signal SIG to the process launched by the selected jobs.
 
 =item B<-b, --besteffort>
 
-Tag specified jobs as besteffort (or remove it if they are already besteffort)
+Change jobs to besteffort (or remove them if they are already besteffort)
 
 =item B<--array> 
 
-Delete/checkpoint array job(s) passed as parameter (all the sub-jobs of the given array job(s))
+Handle array job ids, and their sub-jobs.
 
 =item B<--sql>
 
-Delete/checkpoint jobs which respond to the SQL where clause on the table jobs (ex: "project = 'p1'").
+Select jobs using a SQL WHERE clause on table jobs (e.g. "project = 'p1'")
 
 =item B<--force-terminate-finishing-job>
 
-Force to switch the jobs into the Error state when they are stuck in Finishing.
-
-Note: the nodes where the jobs were executing will be turned into Suspected because something wrong occured if this option has to be used.
+Force jobs stuck in the Finishing state to switch to Terminated (Warning: only use as a last resort)
 
+This using this option indicates that something nasty happened, wodes where the jobs were executing will subsequently be turned into Suspected.
 
 =item B<-V, --version>
 
diff --git a/sources/core/qfunctions/oardel b/sources/core/qfunctions/oardel
index b0db939..3d17697 100755
--- a/sources/core/qfunctions/oardel
+++ b/sources/core/qfunctions/oardel
@@ -21,22 +21,21 @@ my $exitValue = 0;
 # Display command help
 sub usage {
     print <<EOS;
-Usage: $0 [-c|-b|-s|--force-terminate-finishing-job][--array][job_ids][-h][-V]
-Delete or send checkpoint signal to jobs.
+Usage: $0 [options] <job_id> [job_id [...] ] 
+       $0 [options] --sql <SQL WHERE clause>
+
 Options:
   -h, --help              show this help screen
-  -c, --checkpoint        send checkpoint signal to the job_ids
-  -s, --signal		  send the signal given as parameter to the job_ids
-  -b, --besteffort        tag specified jobs as besteffort (or remove it
-                          if they are already besteffort)
-      --array             delete/checkpoint array job(s) passed as parameter 
-                          (all the sub-jobs)
-      --sql               delete/checkpoint jobs which respond to the SQL
-                          where clause on the table jobs
-                          (ex: "project = 'p1'")
+  -c, --checkpoint        send checkpoint signal to the jobs
+  -s, --signal <SIG>      send signal SIG to the jobs
+  -b, --besteffort        change the specified jobs to besteffort jobs (or
+                          remove them if they are already besteffort)
+      --array             handle array job ids, and their sub jobs.
+      --sql <SQL>         select jobs using a SQL WHERE clause on table jobs
+                          (e.g. "project = 'p1'")
       --force-terminate-finishing-job
-                          force the job_ids in Finishing state to turn into
-                          Terminated (must be used at a last resort)
+                          force jobs stuck in the Finishing state to switch to
+                          Terminated (Warning: only use as a last resort)
   -V, --version           print OAR version number
 EOS
     exit(1);
@@ -80,7 +79,7 @@ my $array;
 my $Force_terminate_finishing_job;
 
 GetOptions ("checkpoint|c" => \$Checkpoint,
-            "signal|s:s" => \$signal,
+            "signal|s=s" => \$signal,
             "besteffort|b" => \$Besteffort,
             "help|h" => \$sos,
             "array" => \$array,
-----------------------------------------------------------------------

Summary of changes:
 sources/core/man/man1/oardel.pod |   20 ++++++++++----------
 sources/core/qfunctions/oardel   |   27 +++++++++++++--------------
 2 files changed, 23 insertions(+), 24 deletions(-)


hooks/post-receive
-- 
OAR



More information about the Oar-commits mailing list