From c72a6497a6485f70ee765a82c33de080a2868c91 Mon Sep 17 00:00:00 2001 From: Alejandro Sanchez <alex@schedmd.com> Date: Thu, 16 Feb 2017 16:53:20 +0100 Subject: [PATCH] Doc - replace vestigial --shared by --oversubscribe. --- doc/html/cons_res.shtml | 2 +- doc/html/cons_res_share.shtml | 10 +++++----- doc/man/man5/slurm.conf.5 | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/html/cons_res.shtml b/doc/html/cons_res.shtml index 984c07f27fd..877595f6f88 100644 --- a/doc/html/cons_res.shtml +++ b/doc/html/cons_res.shtml @@ -99,7 +99,7 @@ way as when using the default node selection scheme.</li> exclusive mode even when consumable resources is enabled. see "man srun" for details. </li> -<li>srun's <i>-s</i> or <i>--share</i> is incompatible with the consumable +<li>srun's <i>-s</i> or <i>--oversubscribe</i> is incompatible with the consumable resource environment and will therefore not be honored. Since in this environment nodes are shared by default, <i>--exclusive</i> allows users to obtain dedicated nodes.</li> diff --git a/doc/html/cons_res_share.shtml b/doc/html/cons_res_share.shtml index 232d86358a4..f37a59a8d91 100644 --- a/doc/html/cons_res_share.shtml +++ b/doc/html/cons_res_share.shtml @@ -37,7 +37,7 @@ per partition/queue.</TD> </TR><TR> <TD>OverSubscribe=YES</TD> <TD>By default same as OverSubscribe=NO. Nodes allocated to a job may be shared with -other jobs if each job allows sharing via the <CODE>srun --shared</CODE> +other jobs if each job allows sharing via the <CODE>srun --oversubscribe</CODE> option.</TD> </TR><TR> <TD>OverSubscribe=FORCE</TD> @@ -54,7 +54,7 @@ per partition/queue.</TD> </TR><TR> <TD>OverSubscribe=YES</TD> <TD>By default same as OverSubscribe=NO. Cores allocated to a job may be shared with -other jobs if each job allows sharing via the <CODE>srun --shared</CODE> +other jobs if each job allows sharing via the <CODE>srun --oversubscribe</CODE> option.</TD> </TR><TR> <TD>OverSubscribe=FORCE</TD> @@ -71,7 +71,7 @@ per partition/queue.</TD> </TR><TR> <TD>OverSubscribe=YES</TD> <TD>By default same as OverSubscribe=NO. CPUs allocated to a job may be shared with -other jobs if each job allows sharing via the <CODE>srun --shared</CODE> +other jobs if each job allows sharing via the <CODE>srun --oversubscribe</CODE> option.</TD> </TR><TR> <TD>OverSubscribe=FORCE</TD> @@ -88,7 +88,7 @@ per partition/queue.</TD> </TR><TR> <TD>OverSubscribe=YES</TD> <TD>By default same as OverSubscribe=NO. Sockets allocated to a job may be shared with -other jobs if each job allows sharing via the <CODE>srun --shared</CODE> +other jobs if each job allows sharing via the <CODE>srun --oversubscribe</CODE> option.</TD> </TR><TR> <TD>OverSubscribe=FORCE</TD> @@ -132,7 +132,7 @@ Slurm has supported configuring nodes in more than one partition since version different <CODE>OverSubscribe</CODE> settings will be allocated to jobs. Note that "shared" jobs are jobs that are submitted to partitions configured with <CODE>OverSubscribe=FORCE</CODE> or with <CODE>OverSubscribe=YES</CODE> and the job requested -sharing with the <CODE>srun --shared</CODE> option. Conversely, "non-shared" +sharing with the <CODE>srun --oversubscribe</CODE> option. Conversely, "non-shared" jobs are jobs that are submitted to partitions configured with <CODE>OverSubscribe=NO</CODE> or <CODE>OverSubscribe=YES</CODE> and the job did <U>not</U> request sharable resources. diff --git a/doc/man/man5/slurm.conf.5 b/doc/man/man5/slurm.conf.5 index 4ff3ac76a62..adc308a56ba 100644 --- a/doc/man/man5/slurm.conf.5 +++ b/doc/man/man5/slurm.conf.5 @@ -4484,7 +4484,7 @@ with \fISelectType=cons_res\fR. Makes all resources in the partition available for sharing upon request by the job. Resources will only be over\-subscribed when explicitly requested -by the user using the "\-\-share" option on job submission. +by the user using the "\-\-oversubscribe" option on job submission. May be followed with a colon and maximum number of jobs in running or suspended state. For example "OverSubscribe=YES:4" enables each node, socket or -- GitLab