appengine/swarming/server/task_scheduler.py - Issue 2267363004: Add CIPD pin reporting to swarming.

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/swarming/server/task_scheduler.py

Issue 2267363004: Add CIPD pin reporting to swarming. (Closed) Base URL: https://chromium.googlesource.com/external/github.com/luci/luci-py@master

Patch Set: comments and some tests Created 4 years, 4 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

« appengine/swarming/server/task_request.py ('K') | « appengine/swarming/server/task_result.py ('k') | appengine/swarming/swarming_bot/bot_code/task_runner.py » ('j') | appengine/swarming/templates/user_task.html » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: appengine/swarming/server/task_scheduler.py

diff --git a/appengine/swarming/server/task_scheduler.py b/appengine/swarming/server/task_scheduler.py

index 8ead6893a850a9f29a7bbb8f1f0a53edd2851edb..4a7c809d208dc93b4920f8b42aacc8a8afb7fdc5 100644

--- a/appengine/swarming/server/task_scheduler.py

+++ b/appengine/swarming/server/task_scheduler.py

@@ -555,7 +555,8 @@ def bot_reap_task(dimensions, bot_id, bot_version, deadline):

def bot_update_task(

run_result_key, bot_id, output, output_chunk_start, exit_code, duration,

- hard_timeout, io_timeout, cost_usd, outputs_ref, performance_stats):

+ hard_timeout, io_timeout, cost_usd, outputs_ref, cipd_pins,

+ performance_stats):

"""Updates a TaskRunResult and TaskResultSummary, along TaskOutput.

Arguments:

@@ -569,6 +570,7 @@ def bot_update_task(

- io_timeout: Bool set if an I/O timeout occured.

- cost_usd: Cost in $USD of this task up to now.

- outputs_ref: task_request.FilesRef instance or None.

+ - cipd_pins: list(task_request.CipdPackage) or None.

- performance_stats: task_result.PerformanceStats instance or None. Can only

be set when the task is completing.

@@ -596,10 +598,10 @@ def bot_update_task(

packed = task_pack.pack_run_result_key(run_result_key)

logging.debug(

- 'bot_update_task(%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)',

+ 'bot_update_task(%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)',

packed, bot_id, len(output) if output else output, output_chunk_start,

exit_code, duration, hard_timeout, io_timeout, cost_usd, outputs_ref,

- performance_stats)

+ cipd_pins, performance_stats)

result_summary_key = task_pack.run_result_key_to_result_summary_key(

run_result_key)

@@ -655,6 +657,9 @@ def bot_update_task(

if outputs_ref:

run_result.outputs_ref = outputs_ref

+ if cipd_pins:

+ run_result.cipd_pins = cipd_pins

if run_result.state in task_result.State.STATES_RUNNING:

if hard_timeout or io_timeout:

run_result.state = task_result.State.TIMED_OUT