swarmbucket: extend lease to include execution timeout

appengine/cr-buildbucket/swarming/swarming.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """This module integrates buildbucket with swarming.
 
 A bucket config may have "swarming" field that specifies how a builder
 is mapped to a recipe. If build is scheduled for a bucket/builder
 with swarming configuration, the integration overrides the default behavior.
 
@@ skipping 286 matching lines @@
     'swarming_task_id:%s' % task_id,
   ])
   task_req = res.get('request', {})
   for t in task_req.get('tags', []):
     build.tags.append('swarming_tag:%s' % t)
   for d in task_req.get('properties', {}).get('dimensions', []):
     build.tags.append('swarming_dimension:%s:%s' % (d['key'], d['value']))
 
   # Mark the build as leased.
   assert 'expiration_secs' in task, task
+  # task['expiration_secs'] is max time for the task to be pending
   task_expiration = datetime.timedelta(seconds=int(task['expiration_secs']))
-  extra_time = datetime.timedelta(hours=1)
-  build.lease_expiration_date = utils.utcnow() + task_expiration + extra_time
+  # task['execution_timeout_secs'] is max time for the task to run
+  task_expiration += datetime.timedelta(
+      seconds=int(task['properties']['execution_timeout_secs']))
+  task_expiration += datetime.timedelta(hours=1)
+  build.lease_expiration_date = utils.utcnow() + task_expiration
   build.regenerate_lease_key()
   build.leasee = _self_identity()
   build.never_leased = False
 
   # Make it STARTED right away
   # because swarming does not notify on task start.
   build.status = model.BuildStatus.STARTED
   url_format = bucket_cfg.swarming.url_format or DEFAULT_URL_FORMAT
   build.url = url_format.format(
     swarming_hostname=bucket_cfg.swarming.hostname,
@@ skipping 306 matching lines @@
 def _extend_unique(target, items):
   for x in items:
     if x not in target:  # pragma: no branch
       target.append(x)
 
 
 class TaskToken(tokens.TokenKind):
   expiration_sec = 60 * 60 * 24  # 24 hours.
   secret_key = auth.SecretKey('swarming_task_token', scope='local')
   version = 1