Amend the message on collective failure

Have collective command warn if the libssl library is not viable
Main example is RedHat providing pyOpenSSL of relatively ancient vintage.
2026-09-29 08:41:00 +00:00 · 2018-08-17 16:45:45 -04:00 · 2018-08-17 13:57:13 -04:00 · 2018-08-16 14:43:16 -04:00 · 2018-08-08 18:05:45 -04:00 · 2018-08-07 15:43:53 -04:00
3 changed files with 21 additions and 7 deletions
@@ -2065,6 +2065,7 @@ class ConfigManager(object):
        with _synclock:
            if statelessmode:
                return
+            _mkpath(cls._cfgdir)
            with open(os.path.join(cls._cfgdir, 'transactioncount'), 'w') as f:
                f.write(struct.pack('!Q', _txcount))
            if fullsync or 'dirtyglobals' in _cfgstore:
@@ -2074,7 +2075,6 @@ class ConfigManager(object):
                    with _dirtylock:
                        dirtyglobals = copy.deepcopy(_cfgstore['dirtyglobals'])
                        del _cfgstore['dirtyglobals']
-                _mkpath(cls._cfgdir)
                globalf = dbm.open(os.path.join(cls._cfgdir, "globals"), 'c', 384)  # 0600
                try:
                    for globalkey in dirtyglobals:
@@ -270,13 +270,17 @@ class IpmiConsole(conapi.Console):
                                                 kg=self.kg, force=True,
                                                 iohandler=self.handle_data)
            self.solconnection.outputlock = NullLock()
-            while not self.solconnection.connected and not self.broken:
+            while (self.solconnection and not self.solconnection.connected and
+                   not (self.broken or self.solconnection.broken or
+                        self.solconnection.ipmi_session.broken)):
                w = eventlet.event.Event()
                _ipmiwaiters.append(w)
-                w.wait()
-                if self.broken:
-                    break
-            if self.broken:
+                w.wait(15)
+            if (self.broken or not self.solconnection or
+                    self.solconnection.broken or
+                    self.solconnection.ipmi_session.broken):
+                if not self.error:
+                    self.error = 'Unknown error'
                if (self.error.startswith('Incorrect password') or
                        self.error.startswith('Unauthorized name')):
                    raise exc.TargetEndpointBadCredentials
@@ -391,7 +395,8 @@ class IpmiHandler(object):
        self.tenant = cfg.tenant
        tenant = cfg.tenant
        if ((node, tenant) not in persistent_ipmicmds or
-                not persistent_ipmicmds[(node, tenant)].ipmi_session.logged):
+                not persistent_ipmicmds[(node, tenant)].ipmi_session.logged or
+                persistent_ipmicmds[(node, tenant)].ipmi_session.broken):
            try:
                persistent_ipmicmds[(node, tenant)].close_confluent()
            except KeyError:  # was no previous session
@@ -144,6 +144,15 @@ def sessionhdl(connection, authname, skipauth=False, cert=None):
    send_data(connection, {'authpassed': 1})
    request = tlvdata.recv(connection)
    if 'collective' in request and skipauth:
+        if not libssl:
+            tlvdata.send(
+                connection,
+                {'collective': {'error': 'Server either does not have '
+                                         'python-pyopenssl installed or has an '
+                                         'incorrect version installed '
+                                         '(e.g. pyOpenSSL would need to be '
+                                         'replaced with python-pyopenssl)'}})
+            return
        return collective.handle_connection(connection, None, request['collective'],
                                     local=True)
    while request is not None:
Author	SHA1	Message	Date
Jarrod Johnson	df7cba00fd	Amend the message on collective failure	2018-08-17 16:45:45 -04:00
Jarrod Johnson	dfb720d0ee	Have collective command warn if the libssl library is not viable Main example is RedHat providing pyOpenSSL of relatively ancient vintage.	2018-08-17 13:57:13 -04:00
Jarrod Johnson	9b48110155	Do not proceed a logged, but broken session It shouldn't be possible for this to be the case, but out of an abundance of caution, check for this. So far only produced this by forcing broken = True in a debug session. Intended to catch an alleged scenario where console was managing to use a broken session (fixed in pyghmi) and have confluent also recognize the situation for non-console usage).	2018-08-16 14:43:16 -04:00
Jarrod Johnson	3064e7bef6	Ensure path is made prior to creating transactioncount Fresh install will be missing /etc/confluent/cfg. Advance the _mkpath call to fix this problem.	2018-08-08 18:05:45 -04:00
Jarrod Johnson	1d4df8af3a	Fix extraneous error in log on connectivity loss	2018-08-07 15:43:53 -04:00
Jarrod Johnson	2aba6e469c	Correct variable name in the 'connected' fix	2018-08-07 15:31:41 -04:00
Jarrod Johnson	de58593f14	Fix inability to notice underlying broken layers of the SOL Through an unknown set of circumstances, an solconnection could be stuck 'connecting'. In every case analyzed, the ipmi_session was broken. Use that to detect a class of failure and react appropriately.	2018-08-07 15:12:53 -04:00