From 009ae39b0bede80a292faee303d2433ded3594dc Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Wed, 29 Dec 2010 22:11:02 +0000
Subject: [PATCH] Document slurmd's -N <hostname> option.
---
doc/html/faq.shtml | 8 ++++----
doc/man/man8/slurmd.8 | 6 ++++++
src/slurmd/slurmd/slurmd.c | 5 +++--
3 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/doc/html/faq.shtml b/doc/html/faq.shtml
index 9327617e56b..2ec7dcd40ba 100644
--- a/doc/html/faq.shtml
+++ b/doc/html/faq.shtml
@@ -861,8 +861,7 @@ a different set of nodes for the different SLURM systems.
That will permit both systems to allocate switch windows without
conflicts.
-<p><a name="multi_slurmd"><b>14. Can slurm emulate a larger
-cluster?</b></a><br>
+<p><a name="multi_slurmd"><b>14. Can slurm emulate a larger cluster?</b></a><br>
Yes, this can be useful for testing purposes.
It has also been used to partition "fat" nodes into multiple SLURM nodes.
There are two ways to do this.
@@ -882,7 +881,8 @@ physical node needs to be configured to use a different port number. You
will also want to use the "%n" symbol in slurmd related path options in
slurm.conf. </li>
<li>When starting the <i>slurmd</i> daemon, include the <i>NodeName</i>
-of the node that it is supposed to serve on the execute line.</li>
+of the node that it is supposed to serve on the execute line (e.g.
+"slurmd -N hostname").</li>
</ol>
<p>It is strongly recommended that SLURM version 1.2 or higher be used
for this due to its improved support for multiple slurmd daemons.
@@ -1338,6 +1338,6 @@ dset TV::parallel_configs {
</pre></p>
<p class="footer"><a href="#top">top</a></p>
-<p style="text-align:center;">Last modified 2 July 2010</p>
+<p style="text-align:center;">Last modified 29 December 2010</p>
<!--#include virtual="footer.txt"-->
diff --git a/doc/man/man8/slurmd.8 b/doc/man/man8/slurmd.8
index f651ba97a53..09e42ceae2e 100644
--- a/doc/man/man8/slurmd.8
+++ b/doc/man/man8/slurmd.8
@@ -51,6 +51,12 @@ and slurmd will continue as normal.
Set the daemon's nice value to the specified value, typically a negative number.
Also note the \fBPropagatePrioProcess\fR configuration parameter.
+.TP
+\fB\-N <hostname>\fR
+Run the daemon with the given hostname. Used to emulated a larger system
+with more than one slurmd daemon per node. Requires that SLURM be built using
+the \-\-enable\-multiple\-slurmd configure option.
+
.TP
\fB\-v\fR
Verbose operation. Multiple \-v's increase verbosity.
diff --git a/src/slurmd/slurmd/slurmd.c b/src/slurmd/slurmd/slurmd.c
index d9fb7cebc5e..9871064edbe 100644
--- a/src/slurmd/slurmd/slurmd.c
+++ b/src/slurmd/slurmd/slurmd.c
@@ -1497,11 +1497,12 @@ Usage: %s [OPTIONS]\n\
-C Print node configuration information and exit.\n\
-d stepd Pathname to the slurmstepd program.\n\
-D Run daemon in foreground.\n\
- -M Use mlock() to lock slurmd pages into memory.\n\
- -h Print this help message.\n\
-f config Read configuration from the specified file.\n\
+ -h Print this help message.\n\
-L logfile Log messages to the file `logfile'.\n\
+ -M Use mlock() to lock slurmd pages into memory.\n\
-n value Run the daemon at the specified nice value.\n\
+ -N host Run the daemon for specified hostname.\n\
-v Verbose mode. Multiple -v's increase verbosity.\n\
-V Print version information and exit.\n", conf->prog);
return;
--
GitLab