diff --git a/doc/man/man1/sbatch.1 b/doc/man/man1/sbatch.1 index 19df4ed6be24075c806af85c6cdf8f3364e5dd88..6985ac843eaf4e605ce0dab7a52ce1c2bc6dd7a3 100644 --- a/doc/man/man1/sbatch.1 +++ b/doc/man/man1/sbatch.1 @@ -1068,9 +1068,10 @@ ignored if \fISchedulerType=sched/wiki\fR or .TP \fB\-\-no\-requeue\fR -Specifies that the batch job should not be requeued after node failure. +Specifies that the batch job should never be requeued under any circumstances. Setting this option will prevent system administrators from being able -to restart the job (for example, after a scheduled downtime). +to restart the job (for example, after a scheduled downtime), recover from +a node failure, or be requeued upon preemption by a higher priority job. When a job is requeued, the batch script is initiated from its beginning. Also see the \fB\-\-requeue\fR option. The \fIJobRequeue\fR configuration parameter controls the default @@ -1275,7 +1276,9 @@ silently ignored. .TP \fB\-\-requeue\fR -Specifies that the batch job should be requeued after node failure. +Specifies that the batch job should eligible to being requeue. +The job may be requeued explicitly by a system administrator, after node +failure, or upon preemption by a higher priority job. When a job is requeued, the batch script is initiated from its beginning. Also see the \fB\-\-no\-requeue\fR option. The \fIJobRequeue\fR configuration parameter controls the default diff --git a/doc/man/man5/slurm.conf.5 b/doc/man/man5/slurm.conf.5 index 79bec02110f16bbc7ceb2508130269ee11ba5b6d..a0091f4c1305cd8ae209f3e04cb400d281690cad 100644 --- a/doc/man/man5/slurm.conf.5 +++ b/doc/man/man5/slurm.conf.5 @@ -1192,11 +1192,13 @@ By default, any existing file is truncated. .TP \fBJobRequeue\fR -This option controls what to do by default after a node failure. -If \fBJobRequeue\fR is set to a value of 1, then any batch job running -on the failed node will be requeued for execution on different nodes. -If \fBJobRequeue\fR is set to a value of 0, then any job running -on the failed node will be terminated. +This option controls the default ability for batch jobs to be requeued. +Jobs may be requeued explicitly by a system administrator, after node +failure, or upon preemption by a higher priority job. +If \fBJobRequeue\fR is set to a value of 1, then batch job may be requeued +unless explicitly disabled by the user. +If \fBJobRequeue\fR is set to a value of 0, then batch job will not be requeued +unless explicitly enabled by the user. Use the \fBsbatch\fR \fI\-\-no\-requeue\fR or \fI\-\-requeue\fR option to change the default behavior for individual jobs. The default value is 1.