diff options
| author | Matthew Barth <msbarth@us.ibm.com> | 2018-05-22 16:33:45 -0500 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-05-30 18:16:13 +0000 |
| commit | 5e0a731fcb45debbdedf944b3de7258bb5604bd3 (patch) | |
| tree | d9a09eb3879549ba755ad38972b9a1c65020972e /meta-openbmc-machines/meta-openpower | |
| parent | 20f1a9dbe7ab6030c137cf4b5f34a34cbd982f5f (diff) | |
| download | talos-openbmc-5e0a731fcb45debbdedf944b3de7258bb5604bd3.tar.gz talos-openbmc-5e0a731fcb45debbdedf944b3de7258bb5604bd3.zip | |
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>
Diffstat (limited to 'meta-openbmc-machines/meta-openpower')
2 files changed, 4 insertions, 4 deletions
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 06602132e..d60aa9179 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 886375d8a..a279cfefa 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 |
