minor fixes

Author: ib-steffen

src/api/handlers/job_api.py

@@ -1,7 +1,6 @@
 #pylint: disable=too-many-lines,too-few-public-methods,too-many-locals,too-many-statements,too-many-branches
 import os
 import json
-import time
 import uuid
 import copy
 import urllib
@@ -874,9 +873,6 @@ def post(self):
                                build_arguments, deployments, limits_cpu, limits_memory, timeout,
                                resources, json.dumps(job), job['cluster']['name']])
 
-            # to make sure the get picked up in the right order by the scheduler
-            time.sleep(0.1)
-
         g.db.commit()
         return "Successfully create jobs"
 

src/job/Dockerfile

@@ -1,6 +1,6 @@
 FROM docker:17.12.1-ce-dind
 
-ENV CLOUD_SDK_VERSION 198.0.0
+ENV CLOUD_SDK_VERSION 210.0.0
 ENV PATH /google-cloud-sdk/bin:$PATH
 
 RUN apk add --no-cache \

src/job/infrabox_job/job.py

@@ -94,9 +94,14 @@ def create_jobs(self, jobs):
         }
 
         while True:
-            r = requests.post("%s/create_jobs" % self.api_server,
-                              headers=self.get_headers(),
-                              json=payload, timeout=60, verify=self.verify)
+            try:
+                r = requests.post("%s/create_jobs" % self.api_server,
+                                  headers=self.get_headers(),
+                                  json=payload, timeout=300, verify=self.verify)
+            except:
+                self.console.collect('Failed to connect to API, retrying.', show=True)
+                time.sleep(3)
+                continue
 
             if r.status_code == 200:
                 return

src/job/job.py

@@ -286,6 +286,9 @@ def check_container_crashed(self):
 
     def main(self):
         self.load_data()
+        # Date
+        self.console.collect("Date:\n", show=True)
+        self.console.execute(['date'], show=True, show_cmd=False)
 
         # Show environment
         self.console.collect("Environment:\n", show=True)

src/pyinfraboxutils/ibflask.py

@@ -186,7 +186,6 @@ def decorated_function(*args, **kwargs):
 
         job_state = r[0]
         if job_state not in ('queued', 'running', 'scheduled'):
-            logger.warn('job not in an active state')
             abort(401, 'Unauthorized')
 
 
@@ -213,7 +212,6 @@ def validate_job_token(token):
 
     job_state = r[0]
     if job_state not in ('queued', 'running', 'scheduled'):
-        logger.warn('job not in an active state')
         abort(401, 'Unauthorized')