Ensure path is made prior to creating transactioncount

Fresh install will be missing /etc/confluent/cfg. Advance the _mkpath call to fix this problem.
Fix extraneous error in log on connectivity loss
2026-09-29 08:41:00 +00:00 · 2018-08-08 18:05:45 -04:00 · 2018-08-07 15:43:53 -04:00 · 2018-08-07 15:31:41 -04:00 · 2018-08-07 15:12:53 -04:00
2 changed files with 10 additions and 6 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
Author	SHA1	Message	Date
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