MAAS

Merge ~troyanov/maas:backport-069e184-3.5 into maas:3.5

  1. Git
  2. lp:~troyanov/maas
  3. backport-069e184-3.5
  4. Merge into 3.5
Proposed by Anton Troyanov
Status: Merged
Approved by: Anton Troyanov
Approved revision: 6b8e4f05314c88bc510e240e7cf0b57aef149012
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~troyanov/maas:backport-069e184-3.5
Merge into: maas:3.5
Diff against target: 13 lines (+1/-1)
1 file modified
src/maasserver/workflow/bootresource.py (+1/-1)
Reviewer Review Type Date Requested Status
Anton Troyanov Approve
Review via email: mp+462479@code.launchpad.net

Commit message

fix(bootresource): lp-2057979. Avoid workflow id clash.

ID must be unique within a namespace

(cherry picked from commit 069e184b0fb96044079d6f75a7ad4f6d1e974494)

To post a comment you must log in.
Revision history for this message
Anton Troyanov (troyanov) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/maasserver/workflow/bootresource.py b/src/maasserver/workflow/bootresource.py
2index a1938d0..4c76a5e 100644
3--- a/src/maasserver/workflow/bootresource.py
4+++ b/src/maasserver/workflow/bootresource.py
5@@ -242,7 +242,7 @@ class SyncBootResourcesWorkflow:
6 return workflow.execute_child_workflow(
7 "download-bootresource",
8 res,
9- id=f"bootresource-download:{res.sha256[:12]}",
10+ id=f"bootresource-download:{region or 'upstream'}:{res.sha256[:12]}",
11 execution_timeout=DOWNLOAD_TIMEOUT,
12 run_timeout=DOWNLOAD_TIMEOUT,
13 id_reuse_policy=WorkflowIDReusePolicy.TERMINATE_IF_RUNNING,

Subscribers

People subscribed via source and target branches