From fbc0e71219aa7d192986b90639e9d9d53b2da5f2 Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Fri, 25 May 2012 09:49:11 -0700
Subject: [PATCH] Correct default NodeAddr
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

According to man slurm.conf, the default for NodeAddr is NodeName:

  "By  default, the NodeAddr will be identical in value to NodeName."

However, it seems the default is NodeHostname (when that differs from
NodeName): With the following in slurmnodes.conf:

Nodename=c0-0 NodeHostname=compute-0-0 ...

I get

NodeName=c0-0 Arch=x86_64 CoresPerSocket=2
   CPUAlloc=0 CPUErr=0 CPUTot=4 Features=intel,rack0,hugemem
   Gres=(null)
***
   NodeAddr=compute-0-0 NodeHostName=compute-0-0
***
   OS=Linux RealMemory=3949 Sockets=2
   State=IDLE ThreadsPerCore=1 TmpDisk=10000 Weight=1027
   BootTime=2012-05-08T15:07:08 SlurmdStartTime=2012-05-25T10:30:10

(This is with 2.4.0-0.pre4.)

(We are planning to use cx-y instead of compute-x-y (the rocks default)
on our next cluster, to save some typing.)

--
Regards,
Bjørn-Helge Mevik, dr. scient,
Research Computing Services, University of Oslo
---
 doc/man/man5/slurm.conf.5 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/man/man5/slurm.conf.5 b/doc/man/man5/slurm.conf.5
index a4837e95155..8dc9d77778d 100644
--- a/doc/man/man5/slurm.conf.5
+++ b/doc/man/man5/slurm.conf.5
@@ -2328,7 +2328,7 @@ they must exactly match the entries in the \fBNodeName\fR
 (e.g. "NodeName=lx[0\-7] NodeAddr="elx[0\-7]").
 \fBNodeAddr\fR may also contain IP addresses.
 By default, the \fBNodeAddr\fR will be identical in value to
-\fBNodeName\fR.
+\fBNodeHostname\fR.
 
 .TP
 \fBCoresPerSocket\fR
-- 
GitLab