ensure proper phosphor-logging dependencies
As more errors are added to state-manager services, need to ensure they
are run after phosphor-logging is up and running. I saw an error path
recently on a BMC reset with the host up scenario where
bmc-state-manager tried to log an error but phosphor-logging was not
running yet, resulting in an unhandled exception.
Tested:
- Verify all state services start after logging (bmc is earliest):
Mar 09 18:40:33 p10bmc systemd[1]: Starting Phosphor Log Manager...
Mar 09 18:40:34 p10bmc systemd[1]: Started Phosphor Log Manager.
Mar 09 18:40:34 p10bmc systemd[1]: Starting Phosphor BMC State Manager...
Mar 09 18:40:35 p10bmc systemd[1]: Started Phosphor BMC State Manager.
- Verify PEL data after all services running:
"User Data 0": {
"Section Version": "1",
"Sub-section type": "1",
"Created by": "0x2000",
"BMCState": "Ready",
"BootState": "Unspecified",
"ChassisState": "Off",
"FW Version ID": "fw1020.00-44.2-9-g1186c2a5f8",
"HostState": "Off",
"System IM": "50001001"
},
- Verify PEL data when BMC state service is stopped, and logging service
is restarted (to mimic error prior to state service running)
"User Data 0": {
"Section Version": "1",
"Sub-section type": "1",
"Created by": "0x2000",
"BMCState": "",
"BootState": "Unspecified",
"ChassisState": "Off",
"FW Version ID": "fw1020.00-44.2-9-g1186c2a5f8",
"HostState": "Off",
"System IM": "50001001"
},
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: Id9528ab911fc57b400e40fdfc9353f4432f57d63
diff --git a/service_files/phosphor-systemd-target-monitor.service b/service_files/phosphor-systemd-target-monitor.service
index 1a9fc06..f43331e 100644
--- a/service_files/phosphor-systemd-target-monitor.service
+++ b/service_files/phosphor-systemd-target-monitor.service
@@ -1,6 +1,8 @@
[Unit]
Description=phosphor systemd target monitor
After=dbus.service
+Wants=xyz.openbmc_project.Logging.service
+After=xyz.openbmc_project.Logging.service
[Service]
Restart=always
diff --git a/service_files/xyz.openbmc_project.State.BMC.service b/service_files/xyz.openbmc_project.State.BMC.service
index 7c92690..5171877 100644
--- a/service_files/xyz.openbmc_project.State.BMC.service
+++ b/service_files/xyz.openbmc_project.State.BMC.service
@@ -3,6 +3,8 @@
Before=mapper-wait@-xyz-openbmc_project-state-bmc.service
Wants=obmc-mapper.target
After=obmc-mapper.target
+Wants=xyz.openbmc_project.Logging.service
+After=xyz.openbmc_project.Logging.service
[Service]
diff --git a/service_files/xyz.openbmc_project.State.Chassis.service b/service_files/xyz.openbmc_project.State.Chassis.service
index 861203a..7594c48 100644
--- a/service_files/xyz.openbmc_project.State.Chassis.service
+++ b/service_files/xyz.openbmc_project.State.Chassis.service
@@ -4,6 +4,8 @@
Wants=obmc-mapper.target
After=obmc-mapper.target
After=org.openbmc.control.Power@0.service
+Wants=xyz.openbmc_project.Logging.service
+After=xyz.openbmc_project.Logging.service
[Service]
ExecStart=/usr/bin/phosphor-chassis-state-manager
diff --git a/service_files/xyz.openbmc_project.State.Host.service b/service_files/xyz.openbmc_project.State.Host.service
index 50b3483..ea3a5a5 100644
--- a/service_files/xyz.openbmc_project.State.Host.service
+++ b/service_files/xyz.openbmc_project.State.Host.service
@@ -10,6 +10,8 @@
After=phosphor-ipmi-host.service
After=pldmd.service
Before=obmc-host-reset@0.target
+Wants=xyz.openbmc_project.Logging.service
+After=xyz.openbmc_project.Logging.service
[Service]
ExecStart=/usr/bin/phosphor-host-state-manager
diff --git a/service_files/xyz.openbmc_project.State.ScheduledHostTransition.service b/service_files/xyz.openbmc_project.State.ScheduledHostTransition.service
index 3d08060..9964724 100644
--- a/service_files/xyz.openbmc_project.State.ScheduledHostTransition.service
+++ b/service_files/xyz.openbmc_project.State.ScheduledHostTransition.service
@@ -5,6 +5,8 @@
After=obmc-mapper.target
Wants=xyz.openbmc_project.State.Host.service
After=xyz.openbmc_project.State.Host.service
+Wants=xyz.openbmc_project.Logging.service
+After=xyz.openbmc_project.Logging.service
[Service]
ExecStart=/usr/bin/phosphor-scheduled-host-transition
@@ -13,4 +15,4 @@
BusName=xyz.openbmc_project.State.ScheduledHostTransition
[Install]
-WantedBy=multi-user.target
\ No newline at end of file
+WantedBy=multi-user.target