Small code cleanup before whitelist addition

buildman/manager/ephemeral.py

@@ -59,6 +59,9 @@ class EphemeralBuilderManager(BaseManager):
     self._etcd_realm_prefix = None
     self._etcd_builder_prefix = None
 
+    self._etcd_lock_prefix = Nopne
+    self._ephemeral_api_timeout = DEFAULT_EPHEMERAL_API_TIMEOUT
+
     self._component_to_job = {}
     self._job_uuid_to_component = {}
     self._component_to_builder = {}
@@ -95,7 +98,6 @@ class EphemeralBuilderManager(BaseManager):
           # at the index we retrieved. We therefore start a new watch at HEAD and
           # (if specified) call the restarter method which should conduct a read and
           # reset the state of the manager.
-          # TODO: Remove this hack once Etcd is fixed.
           logger.exception('Etcd moved forward too quickly. Restarting watch cycle.')
           new_index = None
           if restarter is not None:
@@ -321,12 +323,13 @@ class EphemeralBuilderManager(BaseManager):
     max_expiration = datetime.utcnow() + timedelta(seconds=machine_max_expiration)
 
     payload = {
-        'expiration': calendar.timegm(expiration.timetuple()),
-        'max_expiration': calendar.timegm(max_expiration.timetuple()),
-        'nonce': nonce,
-        'had_heartbeat': False,
-        'job_queue_item': build_job.job_item,
+      'expiration': calendar.timegm(expiration.timetuple()),
+      'max_expiration': calendar.timegm(max_expiration.timetuple()),
+      'nonce': nonce,
+      'had_heartbeat': False,
+      'job_queue_item': build_job.job_item,
     }
+
     lock_payload = json.dumps(payload)
 
     try:
@@ -372,10 +375,10 @@ class EphemeralBuilderManager(BaseManager):
 
     # Store the realm spec which will allow any manager to accept this builder when it connects
     realm_spec = json.dumps({
-        'realm': realm,
-        'token': token,
-        'builder_id': builder_id,
-        'job_queue_item': build_job.job_item,
+      'realm': realm,
+      'token': token,
+      'builder_id': builder_id,
+      'job_queue_item': build_job.job_item,
     })
 
     try:
@@ -388,6 +391,7 @@ class EphemeralBuilderManager(BaseManager):
     except etcd.EtcdException:
       logger.exception('Exception when writing realm %s to etcd for job %s', realm, build_uuid)
       raise Return(False, setup_time)
+
     self._job_to_executor[builder_id] = executor
 
     raise Return(True, None)
@@ -449,11 +453,11 @@ class EphemeralBuilderManager(BaseManager):
     new_expiration = datetime.utcnow() + timedelta(seconds=ttl)
 
     payload = {
-        'expiration': calendar.timegm(new_expiration.timetuple()),
-        'builder_id': build_job_metadata['builder_id'],
-        'job_queue_item': build_job.job_item,
-        'max_expiration': build_job_metadata['max_expiration'],
-        'had_heartbeat': True,
+      'expiration': calendar.timegm(new_expiration.timetuple()),
+      'builder_id': build_job_metadata['builder_id'],
+      'job_queue_item': build_job.job_item,
+      'max_expiration': build_job_metadata['max_expiration'],
+      'had_heartbeat': True,
     }
 
     yield From(self._etcd_client.write(job_key, json.dumps(payload), ttl=ttl))