utils: Use 5s timeout for D-Bus get/set property calls
If the timeout param is not specified in a sdbus call, the default value
of 25s is used, if not configured in the systemd configuration file.
It turns out this timeout is too long than ideal, since the other pieces
in the IPMI stack have much smaller timeout values. For example, the
BTbridge/KCSbridge has a timeout of 5s. It is unnecessary to let ipmid
getting blocked on waiting for D-Bus replies.
This commit changes the timeout to 5 seconds on D-Bus get/set properties,
mainly because these calls are the majority of sensor read/writes which
are most subject to operation timeouts. The other D-Bus operations might
be called for object/service discovering, which might be a one-time
startup procedure.
Resolves: openbmc/openbmc#3494
Signed-off-by: Kun Yi <kunyi731@gmail.com>
Change-Id: I5a55a8eb872b1ebe8730c673231be5037d24fc0b
diff --git a/utils.cpp b/utils.cpp
index 4aaf9c0..7807e76 100644
--- a/utils.cpp
+++ b/utils.cpp
@@ -5,6 +5,7 @@
#include <net/if.h>
#include <algorithm>
+#include <chrono>
#include <phosphor-logging/elog-errors.hpp>
#include <phosphor-logging/log.hpp>
#include <sdbusplus/message/types.hpp>
@@ -132,7 +133,8 @@
Value getDbusProperty(sdbusplus::bus::bus& bus, const std::string& service,
const std::string& objPath, const std::string& interface,
- const std::string& property)
+ const std::string& property,
+ std::chrono::microseconds timeout)
{
Value value;
@@ -142,7 +144,7 @@
method.append(interface, property);
- auto reply = bus.call(method);
+ auto reply = bus.call(method, timeout.count());
if (reply.is_method_error())
{
@@ -161,7 +163,8 @@
PropertyMap getAllDbusProperties(sdbusplus::bus::bus& bus,
const std::string& service,
const std::string& objPath,
- const std::string& interface)
+ const std::string& interface,
+ std::chrono::microseconds timeout)
{
PropertyMap properties;
@@ -170,7 +173,7 @@
method.append(interface);
- auto reply = bus.call(method);
+ auto reply = bus.call(method, timeout.count());
if (reply.is_method_error())
{
@@ -209,14 +212,15 @@
void setDbusProperty(sdbusplus::bus::bus& bus, const std::string& service,
const std::string& objPath, const std::string& interface,
- const std::string& property, const Value& value)
+ const std::string& property, const Value& value,
+ std::chrono::microseconds timeout)
{
auto method = bus.new_method_call(service.c_str(), objPath.c_str(),
PROP_INTF, METHOD_SET);
method.append(interface, property, value);
- if (!bus.call(method))
+ if (!bus.call(method, timeout.count()))
{
log<level::ERR>("Failed to set property",
entry("PROPERTY=%s", property.c_str()),