Merge master changes

endpoints/api/build.py

@@ -72,8 +72,8 @@ def build_status_view(build_obj, can_write=False):
   # minutes. If not, then the build timed out.
   if phase != database.BUILD_PHASE.COMPLETE and phase != database.BUILD_PHASE.ERROR:
     if status is not None and 'heartbeat' in status and status['heartbeat']:
-      heartbeat = datetime.datetime.fromtimestamp(status['heartbeat'])
-      if datetime.datetime.now() - heartbeat > datetime.timedelta(minutes=1):
+      heartbeat = datetime.datetime.utcfromtimestamp(status['heartbeat'])
+      if datetime.datetime.utcnow() - heartbeat > datetime.timedelta(minutes=1):
         phase = database.BUILD_PHASE.INTERNAL_ERROR
 
   logger.debug('Can write: %s job_config: %s', can_write, build_obj.job_config)

endpoints/api/user.py

@@ -246,7 +246,7 @@ class User(ApiResource):
           # Username already used
           raise request_error(message='Username is already in use')
 
-        model.change_username(user, new_username)
+        model.change_username(user.id, new_username)
 
     except model.InvalidPasswordException, ex:
       raise request_error(exception=ex)

endpoints/common.py

@@ -211,7 +211,7 @@ def start_build(repository, dockerfile_id, tags, build_name, subdir, manual,
     dockerfile_build_queue.put([repository.namespace_user.username, repository.name], json.dumps({
       'build_uuid': build_request.uuid,
       'pull_credentials': model.get_pull_credentials(pull_robot_name) if pull_robot_name else None
-    }), retries_remaining=1)
+    }), retries_remaining=3)
 
   # Add the build to the repo's log.
   metadata = {

endpoints/registry.py

@@ -137,6 +137,10 @@ def get_image_layer(namespace, repository, image_id, headers):
   if permission.can() or model.repository_is_public(namespace, repository):
     profile.debug('Looking up repo image')
     repo_image = model.get_repo_image_extended(namespace, repository, image_id)
+    if not repo_image:
+      profile.debug('Image not found')
+      abort(404, 'Image %(image_id)s not found', issue='unknown-image',
+            image_id=image_id)
 
     profile.debug('Looking up the layer path')
     try:
@@ -157,7 +161,7 @@ def get_image_layer(namespace, repository, image_id, headers):
 
       return Response(store.stream_read(repo_image.storage.locations, path), headers=headers)
     except (IOError, AttributeError):
-      profile.debug('Image not found')
+      profile.exception('Image layer data not found')
       abort(404, 'Image %(image_id)s not found', issue='unknown-image',
             image_id=image_id)
 
@@ -180,6 +184,7 @@ def put_image_layer(namespace, repository, image_id):
     uuid = repo_image.storage.uuid
     json_data = store.get_content(repo_image.storage.locations, store.image_json_path(uuid))
   except (IOError, AttributeError):
+    profile.exception('Exception when retrieving image data')
     abort(404, 'Image %(image_id)s not found', issue='unknown-image',
           image_id=image_id)