Merge branch 'lenovo:master' into patch-6

confluent_client/bin/nodesensors

@@ -37,6 +37,12 @@ class hybridcsv(csv.excel):
     lineterminator = '\n'
 
 
+def floatformat(num):
+    fm = u'{:.5f}'.format(num).rstrip('0')
+    if fm[-1:] == u'.':
+        return fm + u'0'
+    return fm
+
 csv.register_dialect('hybrid', hybridcsv)
 
 import confluent.client as client
@@ -135,7 +141,7 @@ def sensorpass(showout=True, appendtime=False):
                         if sensedata['value'] is None:
                             showval = ''
                         elif isinstance(sensedata['value'], float):
-                            showval = u' {0:.5f} '.format(sensedata['value'])
+                            showval = floatformat(sensedata['value'])
                         else:
                             showval = u' {0} '.format(sensedata['value'])
                         if sensedata['units'] not in (None, u''):
@@ -191,6 +197,8 @@ def format_csv(csvwriter, orderedsensors, resdata, showtime=True):
                             datum = ','.join([datum, healthstates])
                         else:
                             datum = healthstates
+                if isinstance(datum, float):
+                    datum = floatformat(datum)
                 rowdata.append(datum)
             except KeyError:
                 rowdata.append('N/A')

confluent_osdeploy/esxi7/profiles/hypervisor/scripts/makeksnet

@@ -33,6 +33,8 @@ for info in vswinfo.split('\n'):
     upinfo = uplinkmatch.match(info)
     if upinfo:
         vmnic = upinfo.group(1)
+        if vmnic and 'vusb0' not in vmnic:
+            break
 try:
     with open('/tmp/confluentident/cnflnt.jsn') as identin:
         identcfg = json.load(identin)

confluent_server/bin/confluent_selfcheck

@@ -15,7 +15,7 @@ import confluent.sshutil as sshutil
 import confluent.certutil as certutil
 import confluent.client as client
 import confluent.config.configmanager as configmanager
-import subprocess
+import eventlet.green.subprocess as subprocess
 import tempfile
 import shutil
 import eventlet.green.socket as socket

confluent_server/confluent/collective/manager.py

@@ -61,10 +61,15 @@ class ContextBool(object):
 
 connecting = ContextBool()
 leader_init = ContextBool()
+enrolling = ContextBool()
 
 def connect_to_leader(cert=None, name=None, leader=None, remote=None):
     global currentleader
     global follower
+    ocert = cert
+    oname = name
+    oleader = leader
+    oremote = remote
     if leader is None:
         leader = currentleader
     log.log({'info': 'Attempting connection to leader {0}'.format(leader),
@@ -138,7 +143,9 @@ def connect_to_leader(cert=None, name=None, leader=None, remote=None):
                         remote.close()
                     except Exception:
                         pass
-                    raise Exception("Error doing initial DB transfer")
+                    log.log({'error': 'Retrying connection, error during initial sync', 'subsystem': 'collective'})
+                    return connect_to_leader(ocert, oname, oleader, oremote)
+                    raise Exception("Error doing initial DB transfer")  # bad ssl write retry
                 dbjson += ndata
             cfm.clear_configuration()
             try:
@@ -390,34 +397,42 @@ def handle_connection(connection, cert, request, local=False):
             eventlet.spawn_n(connect_to_leader, rsp['collective'][
                 'fingerprint'], name)
     if 'enroll' == operation:
-        #TODO(jjohnson2): error appropriately when asked to enroll, but the master is elsewhere
-        mycert = util.get_certificate_from_file('/etc/confluent/srvcert.pem')
-        proof = base64.b64decode(request['hmac'])
-        myrsp = invites.check_client_proof(request['name'], mycert,
-                                           cert, proof)
-        if not myrsp:
-            tlvdata.send(connection, {'error': 'Invalid token'})
-            connection.close()
-            return
-        if not list(cfm.list_collective()):
-            # First enrollment of a collective, since the collective doesn't
-            # quite exist, then set initting false to let the enrollment action
-            # drive this particular initialization
-            initting = False
-        myrsp = base64.b64encode(myrsp)
-        fprint = util.get_fingerprint(cert)
-        myfprint = util.get_fingerprint(mycert)
-        cfm.add_collective_member(get_myname(),
-                                  connection.getsockname()[0], myfprint)
-        cfm.add_collective_member(request['name'],
-                                  connection.getpeername()[0], fprint)
-        myleader = get_leader(connection)
-        ldrfprint = cfm.get_collective_member_by_address(
-            myleader)['fingerprint']
-        tlvdata.send(connection,
-                     {'collective': {'approval': myrsp,
-                                     'fingerprint': ldrfprint,
-                                     'leader': get_leader(connection)}})
+        with enrolling:
+            cfm.check_quorum()
+            mycert = util.get_certificate_from_file('/etc/confluent/srvcert.pem')
+            proof = base64.b64decode(request['hmac'])
+            myrsp = invites.check_client_proof(request['name'], mycert,
+                                            cert, proof)
+            if not myrsp:
+                tlvdata.send(connection, {'error': 'Invalid token'})
+                connection.close()
+                return
+            if not list(cfm.list_collective()):
+                # First enrollment of a collective, since the collective doesn't
+                # quite exist, then set initting false to let the enrollment action
+                # drive this particular initialization
+                initting = False
+            myrsp = base64.b64encode(myrsp)
+            fprint = util.get_fingerprint(cert)
+            myfprint = util.get_fingerprint(mycert)
+            cfm.add_collective_member(get_myname(),
+                                    connection.getsockname()[0], myfprint)
+            cfm.add_collective_member(request['name'],
+                                    connection.getpeername()[0], fprint)
+            myleader = get_leader(connection)
+            ldrfprint = cfm.get_collective_member_by_address(
+                myleader)['fingerprint']
+            tlvdata.send(connection,
+                        {'collective': {'approval': myrsp,
+                                        'fingerprint': ldrfprint,
+                                        'leader': get_leader(connection)}})
+            havequorum = False
+            while not havequorum:
+                try:
+                    cfm.check_quorum()
+                    havequorum = True
+                except exc.DegradedCollective:
+                    eventlet.sleep(0.1)
     if 'assimilate' == operation:
         drone = request['name']
         droneinfo = cfm.get_collective_member(drone)

confluent_server/confluent/discovery/core.py

@@ -1184,7 +1184,7 @@ def search_smms_by_cert(currsmm, cert, cfg):
                 if len(nl) == 1:
                     return currsmm, bay, nl[0]
                 return currsmm, bay, None
-    exnl = list(cfg.filter_node_attrubutes('enclosure.extends=' + currsmm))
+    exnl = list(cfg.filter_node_attributes('enclosure.extends=' + currsmm))
     if len(exnl) == 1:
         return search_smms_by_cert(exnl[0], cert, cfg)
 

confluent_server/confluent/plugins/shell/ssh.py

@@ -146,7 +146,7 @@ class SshShell(conapi.Console):
             return
         except cexc.PubkeyInvalid as pi:
             self.ssh.close()
-            self.keyaction = ''
+            self.keyaction = b''
             self.candidatefprint = pi.fingerprint
             self.datacallback(pi.message)
             self.keyattrname = pi.attrname
@@ -197,18 +197,18 @@ class SshShell(conapi.Console):
                 delidx = data.index(b'\x7f')
                 data = data[:delidx - 1] + data[delidx + 1:]
             self.keyaction += data
-            if '\r' in self.keyaction:
-                action = self.keyaction.split('\r')[0]
-                if action.lower() == 'accept':
+            if b'\r' in self.keyaction:
+                action = self.keyaction.split(b'\r')[0]
+                if action.lower() == b'accept':
                     self.nodeconfig.set_node_attributes(
                         {self.node:
                              {self.keyattrname: self.candidatefprint}})
                     self.datacallback('\r\n')
                     self.logon()
-                elif action.lower() == 'disconnect':
+                elif action.lower() == b'disconnect':
                     self.datacallback(conapi.ConsoleEvent.Disconnect)
                 else:
-                    self.keyaction = ''
+                    self.keyaction = b''
                     self.datacallback('\r\nEnter "disconnect" or "accept": ')
             elif len(data) > 0:
                 self.datacallback(data)