Minor code structure improvements
This commit is contained in:
Tigerblue77
parent
ce7bb3fc9a
commit
db64028f2f
3 changed files with 32 additions and 54 deletions
|
|
@ -14,8 +14,7 @@ trap 'graceful_exit' SIGINT SIGQUIT SIGTERM
|
|||
# readonly DELL_FRESH_AIR_COMPLIANCE=45
|
||||
|
||||
# Check if FAN_SPEED variable is in hexadecimal format. If not, convert it to hexadecimal
|
||||
if [[ $FAN_SPEED == 0x* ]]
|
||||
then
|
||||
if [[ $FAN_SPEED == 0x* ]]; then
|
||||
readonly DECIMAL_FAN_SPEED=$(printf '%d' $FAN_SPEED)
|
||||
readonly HEXADECIMAL_FAN_SPEED=$FAN_SPEED
|
||||
else
|
||||
|
|
@ -24,8 +23,7 @@ else
|
|||
fi
|
||||
|
||||
# Check if the iDRAC host is set to 'local' or not then set the IDRAC_LOGIN_STRING accordingly
|
||||
if [[ $IDRAC_HOST == "local" ]]
|
||||
then
|
||||
if [[ $IDRAC_HOST == "local" ]]; then
|
||||
# Check that the Docker host IPMI device (the iDRAC) has been exposed to the Docker container
|
||||
if [ ! -e "/dev/ipmi0" ] && [ ! -e "/dev/ipmi/0" ] && [ ! -e "/dev/ipmidev/0" ]; then
|
||||
echo "/!\ Could not open device at /dev/ipmi0 or /dev/ipmi/0 or /dev/ipmidev/0, check that you added the device to your Docker container or stop using local mode. Exiting." >&2
|
||||
|
|
@ -40,15 +38,13 @@ fi
|
|||
|
||||
get_Dell_server_model
|
||||
|
||||
if [[ ! $SERVER_MANUFACTURER == "DELL" ]]
|
||||
then
|
||||
if [[ ! $SERVER_MANUFACTURER == "DELL" ]]; then
|
||||
echo "/!\ Your server isn't a Dell product. Exiting." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# If server model is Gen 14 (*40) or newer
|
||||
if [[ $SERVER_MODEL =~ .*[RT][[:space:]]?[0-9][4-9]0.* ]]
|
||||
then
|
||||
if [[ $SERVER_MODEL =~ .*[RT][[:space:]]?[0-9][4-9]0.* ]]; then
|
||||
DELL_POWEREDGE_GEN_14_OR_NEWER=true
|
||||
CPU1_TEMPERATURE_INDEX=2
|
||||
CPU2_TEMPERATURE_INDEX=4
|
||||
|
|
@ -78,19 +74,16 @@ IS_DELL_FAN_CONTROL_PROFILE_APPLIED=true
|
|||
IS_EXHAUST_TEMPERATURE_SENSOR_PRESENT=true
|
||||
IS_CPU2_TEMPERATURE_SENSOR_PRESENT=true
|
||||
retrieve_temperatures $IS_EXHAUST_TEMPERATURE_SENSOR_PRESENT $IS_CPU2_TEMPERATURE_SENSOR_PRESENT
|
||||
if [ -z "$EXHAUST_TEMPERATURE" ]
|
||||
then
|
||||
if [ -z "$EXHAUST_TEMPERATURE" ]; then
|
||||
echo "No exhaust temperature sensor detected."
|
||||
IS_EXHAUST_TEMPERATURE_SENSOR_PRESENT=false
|
||||
fi
|
||||
if [ -z "$CPU2_TEMPERATURE" ]
|
||||
then
|
||||
if [ -z "$CPU2_TEMPERATURE" ]; then
|
||||
echo "No CPU2 temperature sensor detected."
|
||||
IS_CPU2_TEMPERATURE_SENSOR_PRESENT=false
|
||||
fi
|
||||
# Output new line to beautify output if one of the previous conditions have echoed
|
||||
if ! $IS_EXHAUST_TEMPERATURE_SENSOR_PRESENT || ! $IS_CPU2_TEMPERATURE_SENSOR_PRESENT
|
||||
then
|
||||
if ! $IS_EXHAUST_TEMPERATURE_SENSOR_PRESENT || ! $IS_CPU2_TEMPERATURE_SENSOR_PRESENT; then
|
||||
echo ""
|
||||
fi
|
||||
|
||||
|
|
@ -103,39 +96,33 @@ while true; do
|
|||
retrieve_temperatures $IS_EXHAUST_TEMPERATURE_SENSOR_PRESENT $IS_CPU2_TEMPERATURE_SENSOR_PRESENT
|
||||
|
||||
# Define functions to check if CPU 1 and CPU 2 temperatures are above the threshold
|
||||
function CPU1_OVERHEAT () { [ $CPU1_TEMPERATURE -gt $CPU_TEMPERATURE_THRESHOLD ]; }
|
||||
if $IS_CPU2_TEMPERATURE_SENSOR_PRESENT
|
||||
then
|
||||
function CPU2_OVERHEAT () { [ $CPU2_TEMPERATURE -gt $CPU_TEMPERATURE_THRESHOLD ]; }
|
||||
function CPU1_OVERHEAT() { [ $CPU1_TEMPERATURE -gt $CPU_TEMPERATURE_THRESHOLD ]; }
|
||||
if $IS_CPU2_TEMPERATURE_SENSOR_PRESENT; then
|
||||
function CPU2_OVERHEAT() { [ $CPU2_TEMPERATURE -gt $CPU_TEMPERATURE_THRESHOLD ]; }
|
||||
fi
|
||||
|
||||
# Initialize a variable to store the comments displayed when the fan control profile changed
|
||||
COMMENT=" -"
|
||||
# Check if CPU 1 is overheating then apply Dell default dynamic fan control profile if true
|
||||
if CPU1_OVERHEAT
|
||||
then
|
||||
if CPU1_OVERHEAT; then
|
||||
apply_Dell_fan_control_profile
|
||||
|
||||
if ! $IS_DELL_FAN_CONTROL_PROFILE_APPLIED
|
||||
then
|
||||
if ! $IS_DELL_FAN_CONTROL_PROFILE_APPLIED; then
|
||||
IS_DELL_FAN_CONTROL_PROFILE_APPLIED=true
|
||||
|
||||
# If CPU 2 temperature sensor is present, check if it is overheating too.
|
||||
# Do not apply Dell default dynamic fan control profile as it has already been applied before
|
||||
if $IS_CPU2_TEMPERATURE_SENSOR_PRESENT && CPU2_OVERHEAT
|
||||
then
|
||||
if $IS_CPU2_TEMPERATURE_SENSOR_PRESENT && CPU2_OVERHEAT; then
|
||||
COMMENT="CPU 1 and CPU 2 temperatures are too high, Dell default dynamic fan control profile applied for safety"
|
||||
else
|
||||
COMMENT="CPU 1 temperature is too high, Dell default dynamic fan control profile applied for safety"
|
||||
fi
|
||||
fi
|
||||
# If CPU 2 temperature sensor is present, check if it is overheating then apply Dell default dynamic fan control profile if true
|
||||
elif $IS_CPU2_TEMPERATURE_SENSOR_PRESENT && CPU2_OVERHEAT
|
||||
then
|
||||
elif $IS_CPU2_TEMPERATURE_SENSOR_PRESENT && CPU2_OVERHEAT; then
|
||||
apply_Dell_fan_control_profile
|
||||
|
||||
if ! $IS_DELL_FAN_CONTROL_PROFILE_APPLIED
|
||||
then
|
||||
if ! $IS_DELL_FAN_CONTROL_PROFILE_APPLIED; then
|
||||
IS_DELL_FAN_CONTROL_PROFILE_APPLIED=true
|
||||
COMMENT="CPU 2 temperature is too high, Dell default dynamic fan control profile applied for safety"
|
||||
fi
|
||||
|
|
@ -143,20 +130,17 @@ while true; do
|
|||
apply_user_fan_control_profile
|
||||
|
||||
# Check if user fan control profile is applied then apply it if not
|
||||
if $IS_DELL_FAN_CONTROL_PROFILE_APPLIED
|
||||
then
|
||||
if $IS_DELL_FAN_CONTROL_PROFILE_APPLIED; then
|
||||
IS_DELL_FAN_CONTROL_PROFILE_APPLIED=false
|
||||
COMMENT="CPU temperature decreased and is now OK (<= $CPU_TEMPERATURE_THRESHOLD°C), user's fan control profile applied."
|
||||
fi
|
||||
fi
|
||||
|
||||
# If server model is Gen 14 (*40) or newer
|
||||
if ! $DELL_POWEREDGE_GEN_14_OR_NEWER
|
||||
then
|
||||
if ! $DELL_POWEREDGE_GEN_14_OR_NEWER; then
|
||||
# Enable or disable, depending on the user's choice, third-party PCIe card Dell default cooling response
|
||||
# No comment will be displayed on the change of this parameter since it is not related to the temperature of any device (CPU, GPU, etc...) but only to the settings made by the user when launching this Docker container
|
||||
if $DISABLE_THIRD_PARTY_PCIE_CARD_DELL_DEFAULT_COOLING_RESPONSE
|
||||
then
|
||||
if $DISABLE_THIRD_PARTY_PCIE_CARD_DELL_DEFAULT_COOLING_RESPONSE; then
|
||||
disable_third_party_PCIe_card_Dell_default_cooling_response
|
||||
THIRD_PARTY_PCIE_CARD_DELL_DEFAULT_COOLING_RESPONSE_STATUS="Disabled"
|
||||
else
|
||||
|
|
@ -166,8 +150,7 @@ while true; do
|
|||
fi
|
||||
|
||||
# Print temperatures, active fan control profile and comment if any change happened during last time interval
|
||||
if [ $i -eq $TABLE_HEADER_PRINT_INTERVAL ]
|
||||
then
|
||||
if [ $i -eq $TABLE_HEADER_PRINT_INTERVAL ]; then
|
||||
echo " ------- Temperatures -------"
|
||||
echo " Date & time Inlet CPU 1 CPU 2 Exhaust Active fan speed profile Third-party PCIe card Dell default cooling response Comment"
|
||||
i=0
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue