wspoon: Revert increase fan fail shutdown delay
A change was put in to wait 10 seconds before powering off a system when
too many fan enclosures were non-functional, this reverts that change
back to the original 5 seconds. The original change was done to help
mitigate a performance issue where PDM was held off from being able to
process fan functional state changes.
Reverted change: https://gerrit.openbmc-project.xyz/#/c/8352/
Tested:
System shutdown after 5 seconds with 2 non-functional fan enclosures
Change-Id: If40b54f475a54d151439922fc0893686caeb8ae7
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-policy/air-cooled.yaml b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-policy/air-cooled.yaml
index 0660213..d60aa91 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-policy/air-cooled.yaml
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-policy/air-cooled.yaml
@@ -211,7 +211,7 @@
- name: check group functional enclosures
description: >
'If this condition passes more than one fan enclosure in the group has been
- marked as nonfunctional for ten seconds. Shut the system down.
+ marked as nonfunctional for five seconds. Shut the system down.
For a more detailed definition of nonfunctional, consult the documentation
of xyz.openbmc_project.State.Decorator.OperationalStatus and/or the
@@ -220,7 +220,7 @@
condition: count
paths: fan enclosures
properties: fan functional
- defer: 10000000us
+ defer: 5000000us
callback: log and shutdown
countop: '>'
countbound: 1
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-policy/water-cooled.yaml b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-policy/water-cooled.yaml
index 886375d..a279cfe 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-policy/water-cooled.yaml
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-policy/water-cooled.yaml
@@ -205,7 +205,7 @@
- name: check group functional enclosures
description: >
'If this condition passes more than one fan enclosure in the group has been
- marked as nonfunctional for ten seconds. Shut the system down.
+ marked as nonfunctional for five seconds. Shut the system down.
For a more detailed definition of nonfunctional, consult the documentation
of xyz.openbmc_project.State.Decorator.OperationalStatus and/or the
@@ -214,7 +214,7 @@
condition: count
paths: fan enclosures
properties: fan functional
- defer: 10000000us
+ defer: 5000000us
callback: log and shutdown
countop: '>'
countbound: 1