Modify debug message for multi-host environment
Description:
Add an ID number in the message to indicate which Host/Chassis
is executing the state transition.
Motivation:
In multi-host machines, the journal logs do not clearly show which
host is executing.
Test Log:
'''
Aug 28 06:51:41 bmc phosphor-chassis-state-manager[768]: Change to Chassis1 Power State: xyz.openbmc_project.State.Chassis.PowerState.On
Aug 28 06:51:49 bmc phosphor-discover-system-state[2166]: Host2 power is off, processing power policy xyz.openbmc_project.Control.Power.RestorePolicy.Policy.AlwaysOn
Aug 28 06:51:49 bmc phosphor-discover-system-state[2166]: power_policy=ALWAYS_POWER_ON, powering host2 on (300s delay)
Aug 28 06:51:49 bmc phosphor-host-state-manager[1305]: Host1 state transition request of xyz.openbmc_project.State.Host.Transition.On
Aug 28 06:52:00 bmc phosphor-host-state-manager[1305]: Change to Host1 State: xyz.openbmc_project.State.Host.HostState.Running
Aug 28 07:04:13 bmc phosphor-chassis-state-manager[768]: Change to Chassis1 Requested Power State: xyz.openbmc_project.State.Chassis.Transition.Off
'''
Change-Id: I4db0e7bd361346e4d659b30b9c00587a35292f3a
Signed-off-by: Zoey YJ Chung <zoey.yj.chung.wiwynn@gmail.com>
diff --git a/chassis_state_manager.cpp b/chassis_state_manager.cpp
index 324270b..8c3f7c0 100644
--- a/chassis_state_manager.cpp
+++ b/chassis_state_manager.cpp
@@ -587,8 +587,9 @@
Chassis::Transition Chassis::requestedPowerTransition(Transition value)
{
- info("Change to Chassis Requested Power State: {REQ_POWER_TRAN}",
- "REQ_POWER_TRAN", value);
+ info(
+ "Change to Chassis{CHASSIS_ID} Requested Power State: {REQ_POWER_TRAN}",
+ "CHASSIS_ID", id, "REQ_POWER_TRAN", value);
#if ONLY_ALLOW_BOOT_WHEN_BMC_READY
if ((value != Transition::Off) && (!utils::isBmcReady(this->bus)))
{
@@ -617,8 +618,8 @@
Chassis::PowerState Chassis::currentPowerState(PowerState value)
{
PowerState chassisPowerState;
- info("Change to Chassis Power State: {CUR_POWER_STATE}", "CUR_POWER_STATE",
- value);
+ info("Change to Chassis{CHASSIS_ID} Power State: {CUR_POWER_STATE}",
+ "CHASSIS_ID", id, "CUR_POWER_STATE", value);
chassisPowerState = server::Chassis::currentPowerState(value);
if (chassisPowerState == PowerState::On)
diff --git a/discover_system_state.cpp b/discover_system_state.cpp
index 2153e7c..312a51d 100644
--- a/discover_system_state.cpp
+++ b/discover_system_state.cpp
@@ -183,15 +183,16 @@
std::chrono::duration_cast<std::chrono::seconds>(
powerRestoreDelayUsec);
- info("Host power is off, processing power policy {POWER_POLICY}",
- "POWER_POLICY", powerPolicy);
+ info(
+ "Host{HOST_ID} power is off, processing power policy {POWER_POLICY}",
+ "HOST_ID", hostId, "POWER_POLICY", powerPolicy);
if (RestorePolicy::Policy::AlwaysOn ==
RestorePolicy::convertPolicyFromString(powerPolicy))
{
info(
- "power_policy=ALWAYS_POWER_ON, powering host on ({DELAY}s delay)",
- "DELAY", powerRestoreDelaySec.count());
+ "power_policy=ALWAYS_POWER_ON, powering host{HOST_ID} on ({DELAY}s delay)",
+ "HOST_ID", hostId, "DELAY", powerRestoreDelaySec.count());
#ifdef APPLY_POWER_POLICY_WHEN_BMC_READY
utils::waitBmcReady(bus, powerRestoreDelaySec);
#else
diff --git a/host_state_manager.cpp b/host_state_manager.cpp
index fbb2123..ac9181d 100644
--- a/host_state_manager.cpp
+++ b/host_state_manager.cpp
@@ -406,7 +406,8 @@
Host::Transition Host::requestedHostTransition(Transition value)
{
- info("Host state transition request of {REQ}", "REQ", value);
+ info("Host{HOST_ID} state transition request of {REQ}", "HOST_ID", id,
+ "REQ", value);
#if ONLY_ALLOW_BOOT_WHEN_BMC_READY
if ((value != Transition::Off) && (!utils::isBmcReady(this->bus)))
@@ -462,7 +463,8 @@
Host::HostState Host::currentHostState(HostState value)
{
- info("Change to Host State: {STATE}", "STATE", value);
+ info("Change to Host{HOST_ID} State: {STATE}", "HOST_ID", id, "STATE",
+ value);
return server::Host::currentHostState(value);
}