Switch unit files to start after network-online.target

Using network.target could cause issues in configless operation as DNS may not be accessible yet, which would cause the slurmd to fail to start. Add Wants= alongside After= as is recommended by: https://www.freedesktop.org/wiki/Software/systemd/NetworkTarget/ The slurmctld and the slurmdbd possibly both provide functionality and potentially consume functionality from another host. Bug 11878.
SchedMD · Jun 29, 2021 · e88f7ff · e88f7ff
1 parent e1e7926
commit e88f7ff
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 3 deletions.
diff --git a/NEWS b/NEWS
@@ -117,6 +117,8 @@ documents those changes that are of interest to users and administrators.
  -- auth/jwt - add support for RS256 tokens.
  -- Relax reservation purge due to any invalid uid after creation time.
  -- Reject srun that requests both --exclusive and --overlap.
+ -- service files - change dependency to network-online rather than just
+    network to ensure DNS and other services are available.
 
 * Changes in Slurm 20.11.8
 ==========================

diff --git a/RELEASE_NOTES b/RELEASE_NOTES
@@ -63,6 +63,8 @@ HIGHLIGHTS
  -- Distinguish queued reboot requests (REBOOT@) from issued reboots (REBOOT^).
  -- auth/jwt - add support for RS256 tokens. Also permit the username in the
     'username' field in addition to the 'sun' (Slurm UserName) field.
+ -- service files - change dependency to network-online rather than just
+    network to ensure DNS and other services are available.
 
 CONFIGURATION FILE CHANGES (see man appropriate man page for details)
 =====================================================================

diff --git a/etc/slurmctld.service.in b/etc/slurmctld.service.in
@@ -1,6 +1,7 @@
 [Unit]
 Description=Slurm controller daemon
-After=network.target munge.service
+After=network-online.target munge.service
+Wants=network-online.target
 ConditionPathExists=@sysconfdir@/slurm.conf
 
 [Service]

diff --git a/etc/slurmd.service.in b/etc/slurmd.service.in
@@ -1,6 +1,7 @@
 [Unit]
 Description=Slurm node daemon
 After=munge.service network-online.target remote-fs.target
+Wants=network-online.target
 #ConditionPathExists=@sysconfdir@/slurm.conf
 
 [Service]

diff --git a/etc/slurmdbd.service.in b/etc/slurmdbd.service.in
@@ -1,6 +1,7 @@
 [Unit]
 Description=Slurm DBD accounting daemon
-After=network.target munge.service mysql.service mysqld.service mariadb.service
+After=network-online.target munge.service mysql.service mysqld.service mariadb.service
+Wants=network-online.target
 ConditionPathExists=@sysconfdir@/slurmdbd.conf
 
 [Service]

diff --git a/etc/slurmrestd.service.in b/etc/slurmrestd.service.in
@@ -1,6 +1,7 @@
 [Unit]
 Description=Slurm REST daemon
-After=network.target munge.service slurmctld.service
+After=network-online.target munge.service slurmctld.service
+Wants=network-online.target
 ConditionPathExists=@sysconfdir@/slurm.conf
 
 [Service]