Skip to content

Commit

Permalink
Revert "needs-restarting: get systemd boot time from UnitsLoadStartTi…
Browse files Browse the repository at this point in the history
…mestamp"

This reverts commit 74de8fe.

Resolves: https://issues.redhat.com/browse/RHEL-39775
  • Loading branch information
ppisar committed Jun 6, 2024
1 parent 59ecf48 commit ff993ed
Showing 1 changed file with 0 additions and 24 deletions.
24 changes: 0 additions & 24 deletions plugins/needs_restarting.py
Original file line number Diff line number Diff line change
Expand Up @@ -215,11 +215,6 @@ def get_boot_time():
We have two sources from which to derive the boot time. These values vary
depending on containerization, existence of a Real Time Clock, etc.
For our purposes we want the latest derived value.
- UnitsLoadStartTimestamp property on /org/freedesktop/systemd1
The start time of the service manager, according to systemd itself.
Seems to be more reliable than UserspaceTimestamp when the RTC is
in local time. Works unless the system was not booted with systemd,
such as in (most) containers.
- st_mtime of /proc/1
Reflects the time the first process was run after booting
This works for all known cases except machines without
Expand All @@ -230,25 +225,6 @@ def get_boot_time():
Does not work on containers which share their kernel with the
host - there the host kernel uptime is returned
"""
units_load_start_timestamp = None
try:
bus = dbus.SystemBus()
systemd1 = bus.get_object(
'org.freedesktop.systemd1',
'/org/freedesktop/systemd1'
)
props = dbus.Interface(
systemd1,
dbus.PROPERTIES_IFACE
)
units_load_start_timestamp = props.Get(
'org.freedesktop.systemd1.Manager',
'UnitsLoadStartTimestamp'
)
if units_load_start_timestamp != 0:
return int(units_load_start_timestamp / (1000 * 1000))
except dbus.exceptions.DBusException as e:
logger.debug("D-Bus error getting boot time from systemd: {}".format(e))

proc_1_boot_time = int(os.stat('/proc/1').st_mtime)
if os.path.isfile('/proc/uptime'):
Expand Down

0 comments on commit ff993ed

Please sign in to comment.