Page MenuHomeSoftware Heritage

Multipath setup for saam
ClosedPublic

Authored by olasd on Thu, Nov 19, 1:13 PM.

Details

Summary

Two systemd overrides pulled from the remnants of uffizi:

  • Override the multipath.service unit on bare metal storage servers
  • Delay zfs-import-cache after multipath setup

Related to T2796

Test Plan

octocatalog-diff output:

*** Running octocatalog-diff on host saam.internal.softwareheritage.org
I, [2020-11-19T13:12:37.894550 #83106]  INFO -- : Catalogs compiled for saam.internal.softwareheritage.org
I, [2020-11-19T13:12:38.182309 #83106]  INFO -- : Diffs computed for saam.internal.softwareheritage.org
diff origin/production/saam.internal.softwareheritage.org current/saam.internal.softwareheritage.org
*******************************************
+ File[/etc/systemd/system/multipathd.service] =>
   parameters =>
      "ensure": "file"
      "group": "root"
      "mode": "0444"
      "notify": "Class[Systemd::Systemctl::Daemon_reload]"
      "owner": "root"
      "show_diff": true
      "content": >>>
# Unit overridden by software heritage, to move this service *Before* systemd-udev-settle.service

[Unit]
Description=Device-Mapper Multipath Device Controller
Wants=systemd-udev-trigger.service systemd-udev-settle.service
Before=iscsi.service iscsid.service lvm2-activation-early.service
Before=local-fs-pre.target blk-availability.service systemd-udev-settle.service
After=multipathd.socket systemd-udev-trigger.service
DefaultDependencies=no
Conflicts=shutdown.target
ConditionKernelCommandLine=!nompath
ConditionKernelCommandLine=!multipath=off

[Service]
Type=notify
NotifyAccess=main
LimitCORE=infinity
ExecStartPre=-/sbin/modprobe -a scsi_dh_alua scsi_dh_emc scsi_dh_rdac dm-multipath
ExecStart=/sbin/multipathd -d -s
ExecReload=/sbin/multipathd reconfigure
TasksMax=infinity

[Install]
WantedBy=sysinit.target
Also=multipathd.socket
Alias=multipath-tools.service
<<<
*******************************************
+ File[/etc/systemd/system/zfs-import-cache.service.d/multipath.conf] =>
   parameters =>
      "ensure": "file"
      "group": "root"
      "mode": "0444"
      "notify": ["Class[Systemd::Systemctl::Daemon_reload]"]
      "owner": "root"
      "show_diff": true
      "content": >>>
# Managed by puppet (module profile::multipath)
# Set up zfs after multipath
[Unit]
After=multipathd.socket
<<<
*******************************************
+ File[/etc/systemd/system/zfs-import-cache.service.d] =>
   parameters =>
      "ensure": "directory"
      "group": "root"
      "owner": "root"
      "purge": true
      "recurse": true
*******************************************
+ Package[multipath-tools-boot] =>
   parameters =>
      "ensure": "present"
*******************************************
+ Package[multipath-tools] =>
   parameters =>
      "ensure": "present"
*******************************************
+ Systemd::Dropin_file[zfs-import-cache.service.d/multipath.conf] =>
   parameters =>
      "daemon_reload": "lazy"
      "ensure": "present"
      "filename": "multipath.conf"
      "group": "root"
      "mode": "0444"
      "owner": "root"
      "path": "/etc/systemd/system"
      "show_diff": true
      "unit": "zfs-import-cache.service"
      "content": >>>
# Managed by puppet (module profile::multipath)
# Set up zfs after multipath
[Unit]
After=multipathd.socket
<<<
*******************************************
+ Systemd::Unit_file[multipathd.service] =>
   parameters =>
      "ensure": "present"
      "group": "root"
      "mode": "0444"
      "owner": "root"
      "path": "/etc/systemd/system"
      "show_diff": true
      "source": "puppet:///modules/profile/multipath/multipathd.service"
*******************************************
*** End octocatalog-diff on saam.internal.softwareheritage.org

Diff Detail

Repository
rSPSITE puppet-swh-site
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

olasd created this revision.Thu, Nov 19, 1:13 PM
vsellier accepted this revision.Thu, Nov 19, 2:11 PM

The systemd configuration looks good.

Shouldn't the multipath configuration itself also be commited?

This revision is now accepted and ready to land.Thu, Nov 19, 2:11 PM
olasd added a comment.Thu, Nov 19, 2:36 PM

Shouldn't the multipath configuration itself also be commited?

When it works, maybe...