From b06aaf02d0ab30acadf16b6126adef111b7585bb Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 4 Aug 2021 13:05:12 -0500 Subject: dbus-monitor: add dependency on snmp service All IBM systems support the SNMP trap notification for error logs. This means phosphor-dbus-monitor needs to be careful to not start until the SNMP service is up and running. Without this dependency, situations can be hit, when lots of errors are present, where the phosphor-dbus-monitor calls into the SNMP shared library and hits an unhandled exception when trying to talk to the SNMP service. Tested: - Verified the unhandled exception is no longer seen and phosphor-dbus-monitor starts after the SNMP service. Signed-off-by: Andrew Geissler Change-Id: I8b4ca94c0cdd7721aa8847dc478f3827f040a654 --- .../dbus/phosphor-dbus-monitor/phosphor-dbus-monitor-snmp.conf | 3 +++ meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-dbus-monitor-snmp.conf (limited to 'meta-ibm') diff --git a/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-dbus-monitor-snmp.conf b/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-dbus-monitor-snmp.conf new file mode 100644 index 000000000..6b4f7f5d0 --- /dev/null +++ b/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-dbus-monitor-snmp.conf @@ -0,0 +1,3 @@ +[Unit] +Wants=mapper-wait@-xyz-openbmc_project-network-snmp.service +After=mapper-wait@-xyz-openbmc_project-network-snmp.service diff --git a/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend b/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend index 6731a7abb..78d2d495f 100644 --- a/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend +++ b/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend @@ -1,2 +1,5 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" + SYSTEMD_LINK:phosphor-msl-verify:append:ibm-ac-server = " ../phosphor-msl-verify.service:obmc-chassis-poweron@0.target.requires/phosphor-msl-verify.service" SYSTEMD_LINK:phosphor-msl-verify:append:mihawk = " ../phosphor-msl-verify.service:obmc-chassis-poweron@0.target.requires/phosphor-msl-verify.service" +SYSTEMD_OVERRIDE:${PN}:append = " phosphor-dbus-monitor-snmp.conf:phosphor-dbus-monitor.service.d/phosphor-dbus-monitor-snmp.conf" -- cgit v1.2.3