monitor: Remove presence check in startMonitor()
Before this fix, there was a window where if a fan was removed after
power on but before the monitor start timer expired, no power off
actions would run. This was because the tach sensor value was always
zero, so there would be no tach changed signals so no handlers would
run to start the countdown to the fan becoming nonfunctional.
The startMonitor() function was calling tachChanged() already manually,
but only for present fans. Change the code to call it regardless of if
the fan is present or not, so that tachChanged() can properly handle the
tach sensor values of zero.
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Change-Id: I554e297aeb3f9efb0007721bd8c6305fa706cfed
diff --git a/monitor/fan.cpp b/monitor/fan.cpp
index fc408de..0589593 100644
--- a/monitor/fan.cpp
+++ b/monitor/fan.cpp
@@ -178,43 +178,40 @@
_monitorReady = true;
std::for_each(_sensors.begin(), _sensors.end(), [this](auto& sensor) {
- if (_present)
+ try
{
- try
- {
- // Force a getProperty call to check if the tach sensor is
- // on D-Bus. If it isn't, now set it to nonfunctional.
- // This isn't done earlier so that code watching for
- // nonfunctional tach sensors doesn't take actions before
- // those sensors show up on D-Bus.
- sensor->updateTachAndTarget();
- tachChanged(*sensor);
- }
- catch (const util::DBusServiceError& e)
- {
- // The tach property still isn't on D-Bus. Ensure
- // sensor is nonfunctional, but skip creating an
- // error for it since it isn't a fan problem.
- getLogger().log(std::format(
- "Monitoring starting but {} sensor value not on D-Bus",
- sensor->name()));
+ // Force a getProperty call to check if the tach sensor is
+ // on D-Bus. If it isn't, now set it to nonfunctional.
+ // This isn't done earlier so that code watching for
+ // nonfunctional tach sensors doesn't take actions before
+ // those sensors show up on D-Bus.
+ sensor->updateTachAndTarget();
+ tachChanged(*sensor);
+ }
+ catch (const util::DBusServiceError& e)
+ {
+ // The tach property still isn't on D-Bus. Ensure
+ // sensor is nonfunctional, but skip creating an
+ // error for it since it isn't a fan problem.
+ getLogger().log(std::format(
+ "Monitoring starting but {} sensor value not on D-Bus",
+ sensor->name()));
- sensor->setFunctional(false, true);
+ sensor->setFunctional(false, true);
- if (_numSensorFailsForNonFunc)
+ if (_numSensorFailsForNonFunc)
+ {
+ if (_functional &&
+ (countNonFunctionalSensors() >= _numSensorFailsForNonFunc))
{
- if (_functional && (countNonFunctionalSensors() >=
- _numSensorFailsForNonFunc))
- {
- updateInventory(false);
- }
+ updateInventory(false);
}
-
- // At this point, don't start any power off actions due
- // to missing sensors. Let something else handle that
- // policy.
- _system.fanStatusChange(*this, true);
}
+
+ // At this point, don't start any power off actions due
+ // to missing sensors. Let something else handle that
+ // policy.
+ _system.fanStatusChange(*this, true);
}
});
}