From 5633b35e64bb30ca40c6bb038f3520cef8fd4e2b Mon Sep 17 00:00:00 2001 From: Ben Roberts <ben@schedmd.com> Date: Mon, 9 Nov 2020 16:24:38 -0600 Subject: [PATCH] Docs - Fix formatting of TaskPlugin NOTES Bug 10156 --- doc/man/man5/slurm.conf.5 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/doc/man/man5/slurm.conf.5 b/doc/man/man5/slurm.conf.5 index 6ae645568f3..c7395c42c89 100644 --- a/doc/man/man5/slurm.conf.5 +++ b/doc/man/man5/slurm.conf.5 @@ -4061,6 +4061,7 @@ Lacks support for the \-\-cpu\-bind and/or \-\-mem\-bind srun options. The default value is "task/none". .RE +.RS \fBNOTE:\fR It is recommended to stack \fBtask/affinity,task/cgroup\fR together when configuring TaskPlugin, and setting \fBTaskAffinity=no\fR and \fBConstrainCores=yes\fR in \fBcgroup.conf\fR. This setup uses the task/affinity @@ -4070,10 +4071,12 @@ resources, thus combining the best of both pieces. \fBNOTE:\fR For CRAY systems only: task/cgroup must be used with, and listed \fBafter\fR task/cray_aries in TaskPlugin. The task/affinity plugin can be listed -everywhere, but the previous constraint must be satisfied. So for CRAY systems, +anywhere, but the previous constraint must be satisfied. For CRAY systems, a configuration like this is recommended: - +.nf TaskPlugin=task/affinity,task/cray_aries,task/cgroup +.fi +.RE .TP \fBTaskPluginParam\fR -- GitLab