Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1679)

Unified Diff: appengine/cr-buildbucket/service.py

Issue 1082303002: buildbucket: put_batch endpoint (Closed) Base URL: https://chromium.googlesource.com/infra/infra.git@master
Patch Set: removed memcache import Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « appengine/cr-buildbucket/errors.py ('k') | appengine/cr-buildbucket/test/api_test.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: appengine/cr-buildbucket/service.py
diff --git a/appengine/cr-buildbucket/service.py b/appengine/cr-buildbucket/service.py
index 0fcd66fd5548075644b44cd4ba1ea5c838f494ad..35a650b01b9b689ec06bd0f3f573984928f52f32 100644
--- a/appengine/cr-buildbucket/service.py
+++ b/appengine/cr-buildbucket/service.py
@@ -90,8 +90,10 @@ def current_identity_cannot(action_format, *args):
class BuildBucketService(object):
- def add(
- self, bucket, tags=None, parameters=None, lease_expiration_date=None):
+ @ndb.tasklet
+ def add_async(
+ self, bucket, tags=None, parameters=None, lease_expiration_date=None,
+ client_operation_id=None):
"""Adds the build entity to the build bucket.
Requires the current user to have permissions to add builds to the
@@ -104,20 +106,39 @@ class BuildBucketService(object):
build creation.
lease_expiration_date (datetime.datetime): if not None, the build is
created as leased and its lease_key is not None.
+ client_operation_id (str): client-supplied operation id. If an
+ a build with the same client operation id was added during last minute,
+ it will be returned instead.
Returns:
A new Build.
"""
+ if client_operation_id is not None:
+ if not isinstance(client_operation_id, basestring): # pragma: no cover
+ raise errors.InvalidInputError('client_operation_id must be string')
+ if '/' in client_operation_id: # pragma: no cover
+ raise errors.InvalidInputError('client_operation_id must not contain /')
validate_bucket_name(bucket)
assert parameters is None or isinstance(parameters, dict)
validate_lease_expiration_date(lease_expiration_date)
validate_tags(tags)
tags = tags or []
+ ctx = ndb.get_context()
identity = auth.get_current_identity()
if not acl.can_add_build(bucket, identity):
raise current_identity_cannot('add builds to bucket %s', bucket)
+ if client_operation_id is not None:
+ client_operation_cache_key = (
+ 'client_op/%s/%s/add_build' % (
+ identity.to_bytes(), client_operation_id))
+ build_id = yield ctx.memcache_get(client_operation_cache_key)
+ if build_id:
+ build = yield model.Build.get_by_id_async(build_id)
+ if build: # pragma: no branch
+ raise ndb.Return(build)
+
build = model.Build(
id=model.new_build_id(),
bucket=bucket,
@@ -130,10 +151,17 @@ class BuildBucketService(object):
build.lease_expiration_date = lease_expiration_date
build.leasee = auth.get_current_identity()
build.regenerate_lease_key()
- build.put()
+ yield build.put_async()
logging.info(
'Build %s was created by %s', build.key.id(), identity.to_bytes())
- return build
+
+ if client_operation_id is not None:
+ yield ctx.memcache_set(client_operation_cache_key, build.key.id(), 60)
+ raise ndb.Return(build)
+
+ def add(self, *args, **kwargs):
+ """Sync version of add_async."""
+ return self.add_async(*args, **kwargs).get_result()
def get(self, build_id):
"""Gets a build by |build_id|.
« no previous file with comments | « appengine/cr-buildbucket/errors.py ('k') | appengine/cr-buildbucket/test/api_test.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698