appengine/cr-buildbucket/swarming/swarming.py - Issue 2090453002: swarmbucket: extend lease to include execution timeout

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2090453002: swarmbucket: extend lease to include execution timeout (Closed) Base URL: https://chromium.googlesource.com/infra/infra.git@master

Patch Set: remove extra_time Created 4 years, 6 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

Index: appengine/cr-buildbucket/swarming/swarming.py

diff --git a/appengine/cr-buildbucket/swarming/swarming.py b/appengine/cr-buildbucket/swarming/swarming.py

index ae815c0b96bff3de847725c72c03913e2a2c6665..b45a2d085db3f573b54881b2fc51a6a0462227f7 100644

--- a/appengine/cr-buildbucket/swarming/swarming.py

+++ b/appengine/cr-buildbucket/swarming/swarming.py

@@ -304,9 +304,13 @@ def create_task_async(build):

# 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

« no previous file with comments | « no previous file | no next file » | no next file with comments »