commit | 7a787dd7cfa4c52f1842e40a6757cccc8ca356d6 | [log] [tgz] |
---|---|---|
author | Vishwanatha Subbanna <vishwa@linux.vnet.ibm.com> | Thu Oct 31 06:02:31 2019 -0500 |
committer | Andrew Geissler <geissonator@yahoo.com> | Mon Nov 11 13:36:14 2019 +0000 |
tree | 763ce98924c540669b944768feae7f405be685ff | |
parent | 6d3a2c54d8f4926234ce61996ae1197f85ed3d7b [diff] |
Add support for recoveryoff and recoveron During early stages of system bringup, it is beneficial to have the system in fail state, so that the issue can be debugged faster, instead of getting into recovery mode. Disabling the automatic reboot from Quiesce state and not handling the boot watchdog timeout would help with this. When phosphor-watchdog times out, it starts obmc-host-timeout@0.target to get the BMC through recovery process. This patchset adds mask and unmask on that target to support recoveryoff and recoveryon respectively Tested: ....... Scenario-1: Disable recovery, start Watchdog and enable it: /tmp# ./obmcutil recoveryoff Created symlink /etc/systemd/system/obmc-host-timeout@0.target → /dev/null. /lib/systemd/system/obmc-host-startmin@0.target.wants# obmcutil state CurrentBMCState : xyz.openbmc_project.State.BMC.BMCState.Ready CurrentPowerState : xyz.openbmc_project.State.Chassis.PowerState.Off CurrentHostState : xyz.openbmc_project.State.Host.HostState.Off phosphor-watchdog --continue --service=xyz.openbmc_project.Watchdog --path=/xyz/openbmc_project/watchdog/host0 --target=obmc-host-timeout@0.target & busctl call `mapper get-service /xyz/openbmc_project/watchdog/host0` /xyz/openbmc_project/watchdog/host0 org.freedesktop.DBus.Properties Set ssv xyz.openbmc_project.State.Watchdog Enabled b true phosphor-watchdog[2050]: watchdog: enabled and started phosphor-watchdog[2050]: watchdog: Timed out phosphor-watchdog[2050]: watchdog: Failed to start unit phosphor-watchdog[2050]: watchdog: disabled CurrentBMCState : xyz.openbmc_project.State.BMC.BMCState.Ready CurrentPowerState : xyz.openbmc_project.State.Chassis.PowerState.Off CurrentHostState : xyz.openbmc_project.State.Host.HostState.Off .................................... Scenario-2: Enable recovery and enable watchdog: /tmp# ./obmcutil recoveryon Removed /etc/systemd/system/obmc-host-timeout@0.target. CurrentBMCState : xyz.openbmc_project.State.BMC.BMCState.Ready CurrentPowerState : xyz.openbmc_project.State.Chassis.PowerState.Off CurrentHostState : xyz.openbmc_project.State.Host.HostState.Off busctl call `mapper get-service /xyz/openbmc_project/watchdog/host0` /xyz/openbmc_project/watchdog/host0 org.freedesktop.DBus.Properties Set ssv xyz.openbmc_project.State.Watchdog Enabled b true Oct 31 10:50:45 phosphor-watchdog[2050]: watchdog: enabled and started Oct 31 10:51:15 phosphor-watchdog[2050]: watchdog: Timed out Oct 31 10:51:15 systemd[1]: unit_file_find_fragment: obmc-host-timeout@.target+0 → obmc-host-timeout@0.target Oct 31 10:51:15 phosphor-watchdog[2050]: watchdog: disabled Oct 31 10:51:15 systemd[1]: Stopped target Power0 Host Off. Oct 31 10:51:16 systemd[1]: Stopped target Chassis0 (Power Off). Oct 31 10:51:16 watchdog_timeout[2249]: Host watchdog timed out Oct 31 10:51:16 systemd[1]: Reached target Quiesce Target. Oct 31 10:51:17 systemd[1]: Started Reboot host0. ------------------------------------------------- Change-Id: I3ea030666c6198f9638efd7201805dcecf41b6a6 Signed-off-by: Vishwanatha Subbanna <vishwa@linux.vnet.ibm.com>
This repository contains the software responsible for tracking and controlling the state of different objects within OpenBMC. This currently includes the BMC, Chassis, and Host. The most critical feature of phosphor-state-manager software is its support for requests to power on and off the system by the user.
This software also enforces any restore policy (i.e. auto power on system after a system power event or bmc reset) and ensures its states are updated correctly in situations where the BMC is rebooted and the chassis or host are in on/running states.
This repository also provides a command line tool, obmcutil, which provides basic command line support to query and control phosphor-state-manager applications running within an OpenBMC system. This tool itself runs within an OpenBMC system and utilizes D-Bus APIs. These D-Bus APIs are used for development and debug and are not intended for end users.
As with all OpenBMC applications, interfaces and properties within phosphor-state-manager are D-Bus interfaces. These interfaces are then used by external interface protocols, such as Redfish and IPMI, to report and control state to/by the end user.
phosphor-state-manager makes extensive use of systemd. There is a writeup here with an overview of systemd and its use by OpenBMC.
phosphor-state-manager follows some basics design guidelines in its implementation and use of systemd:
phosphor-state-manager implements states and state requests as defined in phosphor-dbus-interfaces for each object it supports.
Ready
once all services within the default.target have executed. The only state change request you can make of the BMC is for it to reboot itself.On
or Off
.Off
, Running
, or Quiesced
(error condition)As noted above, phosphor-state-manager provides a command line tool, obmcutil, which takes a state
parameter. This will use D-Bus commands to retrieve the above states and present them to the user. It also provides other commands which will send the appropriate D-Bus commands to the above properties to power on/off the chassis and host (see obmcutil --help
within an OpenBMC system).
The above objects also implement other D-Bus objects like power on hours, boot progress, reboot attempts, and operating system status. These D-Bus objects are also defined out in the phosphor-dbus-interfaces repository.
The RestorePolicy defines the behavior the user wants when the BMC is reset. If the chassis or host is on/running then this service will not run. If they are off then the RestorePolicy
will be read and executed by phosphor-state-manager code.
In situations where the BMC is reset and the chassis and host are on and running, its critical that the BMC software do two things:
Note that some of this logic is provided via service files in system-specific meta layers. That is because the logic to determine if the chassis is on or if the host is running can vary from system to system. The requirement to create the files defined below and ensure the common targets go active is a must for anyone wishing to enable this feature.
phosphor-state-manager discovers state vs. trying to cache and save states. This ensure it's always getting the most accurate state information. It discovers the chassis state by checking the pgood
value from the power application. If it determines that power is on then it will do the following:
On
The chassis@0-on file is removed when power is removed from the chassis.
The logic to check if the host is on sends a command to the host, and if a response is received then similar logic to chassis is done:
The host@0-on file is removed when the host is stopped.
./bootstrap.sh ./configure ${CONFIGURE_FLAGS} && make