From 3ff7e42074920d30950439f386314a41c08886ab Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Fri, 20 Jul 2018 13:20:50 -0400 Subject: [PATCH] Change behavior for fallback handling Fallback would do nothing to fix a persistent problem with an IPMI session. For lack of knowing how to avoid the situation, at least make changes so it won't go wrong in the future. --- .../confluent/plugins/hardwaremanagement/ipmi.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py b/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py index 9073cec0..1824203c 100644 --- a/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py +++ b/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py @@ -406,9 +406,10 @@ class IpmiHandler(object): ipmisess = persistent_ipmicmds[(node, tenant)].ipmi_session begin = util.monotonic_time() while ((not (self.broken or self.loggedin)) and - (util.monotonic_time() - begin) < 80): - ipmisess.wait_for_rsp(80) + (util.monotonic_time() - begin) < 30): + ipmisess.wait_for_rsp(31 - (util.monotonic_time() - begin)) if not (self.broken or self.loggedin): + ipmisess._mark_broken() raise exc.TargetEndpointUnreachable( "Login process to " + connparams['bmc'] + " died") except socket.gaierror as ge: