fix conflict

This commit is contained in:
baol 2024-12-18 10:10:20 +08:00
commit 87cb8ed53f
3 changed files with 20 additions and 6 deletions

View File

@ -51,6 +51,7 @@ SlurmdPidFile=/var/run/slurmd.pid
SlurmdPort=6818 SlurmdPort=6818
SlurmdSpoolDir=/var/spool/slurmd SlurmdSpoolDir=/var/spool/slurmd
SlurmUser=slurm SlurmUser=slurm
SlurmdUser=slurm
#SlurmdUser=root #SlurmdUser=root
#SrunEpilog= #SrunEpilog=
#SrunProlog= #SrunProlog=

View File

@ -1,13 +1,18 @@
[Unit] [Unit]
Description=Slurm node daemon Description=Slurm node daemon
After=munge.service network-online.target remote-fs.target After=munge.service network-online.target remote-fs.target sssd.service
Wants=network-online.target Wants=network-online.target
#ConditionPathExists=/opt/slurm/etc/slurm.conf #ConditionPathExists=/etc/slurm/slurm.conf
Documentation=man:slurmd(8)
[Service] [Service]
Type=simple User=slurm
EnvironmentFile=-/etc/sysconfig/slurmd Group=slurm
ExecStart=/opt/slurm/sbin/slurmd -D -s $SLURMD_OPTIONS Type=notify
EnvironmentFile=-/etc/default/slurmd
RuntimeDirectory=slurm
RuntimeDirectoryMode=0755
ExecStart=/usr/sbin/slurmd --systemd $SLURMD_OPTIONS
ExecReload=/bin/kill -HUP $MAINPID ExecReload=/bin/kill -HUP $MAINPID
KillMode=process KillMode=process
LimitNOFILE=131072 LimitNOFILE=131072
@ -23,3 +28,4 @@ TasksMax=infinity
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

View File

@ -1,10 +1,17 @@
#!/bin/bash #!/bin/bash
# 修改 /usr/lib/systemd/system/slurmd.service 文件 # 修改 /usr/lib/systemd/system/slurmd.service 文件
sudo sed -i 's|ExecStart=/usr/sbin/slurmd --systemd $SLURMD_OPTIONS|ExecStart=/usr/sbin/slurmd --conf=/opt/slurm/slurm.conf --systemd $SLURMD_OPTIONS|' /usr/lib/systemd/system/slurmd.service sudo cp /home/laoban/config/files/slurm.conf /etc/slurm/
sudo chown -R slurm: /var/log/slurm
sudo chown -R slurm: /var/spool/slurmd
sudo cp /home/laoban/config/files/slurmd.service /usr/lib/systemd/system/
# 重新加载 systemd 配置 # 重新加载 systemd 配置
sudo systemctl daemon-reload sudo systemctl daemon-reload
# 重启 slurmd 服务 # 重启 slurmd 服务
sudo systemctl restart slurmd sudo systemctl restart slurmd