Skip to content
This repository was archived by the owner on Jul 28, 2025. It is now read-only.

ACR retry GetDigest #861

Merged
BMurri merged 2 commits into from
Mar 5, 2025
Merged

ACR retry GetDigest #861

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14f30cd
ACR retry GetDigest
BMurri Mar 4, 2025
d56bb5a
Merge branch 'main' into bmurri/retry-digest
BMurri Mar 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/deploy-cromwell-on-azure/Deployer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,10 @@ private static bool AsyncRetryExceptionPolicy(Exception ex)
return !dontRetry;
}

private static readonly AsyncRetryPolicy acrGetDigestRetryPolicy = Policy
.Handle<RequestFailedException>(azureException => (int)HttpStatusCode.NotFound == azureException.Status)
.WaitAndRetryAsync(30, retryAttempt => TimeSpan.FromSeconds(10));

private static readonly AsyncRetryPolicy generalRetryPolicy = Policy
.Handle<Exception>()
.WaitAndRetryAsync(3, retryAttempt => TimeSpan.FromSeconds(1));
Expand Down Expand Up @@ -1286,9 +1290,9 @@ private async Task BuildPushAcrAsync(Dictionary<string, string> settings, string
return build;
}));

var tesDigest = (await (client ??= GetClient()).GetArtifact("cromwellonazure/tes", build.Tag.ToString()).GetManifestPropertiesAsync(cts.Token)).Value.Digest;
var tesDigest = (await acrGetDigestRetryPolicy.ExecuteAsync(token => (client ??= GetClient()).GetArtifact("cromwellonazure/tes", build.Tag.ToString()).GetManifestPropertiesAsync(token), cts.Token)).Value.Digest;
settings["ActualTesImageName"] = $"{acr.Data.LoginServer}/cromwellonazure/tes@{tesDigest}";
var triggerserviceDigest = (await (client ??= GetClient()).GetArtifact("cromwellonazure/triggerservice", build.Tag.ToString()).GetManifestPropertiesAsync(cts.Token)).Value.Digest;
var triggerserviceDigest = (await acrGetDigestRetryPolicy.ExecuteAsync(token => (client ??= GetClient()).GetArtifact("cromwellonazure/triggerservice", build.Tag.ToString()).GetManifestPropertiesAsync(token), cts.Token)).Value.Digest;
settings["ActualTriggerServiceImageName"] = $"{acr.Data.LoginServer}/cromwellonazure/triggerservice@{triggerserviceDigest}";
}

Expand Down Expand Up @@ -1318,7 +1322,7 @@ private async Task BuildPushAcrAsync(Dictionary<string, string> settings, string

var name = targetTag[..targetTag.IndexOf(':')];
var tag = targetTag[(targetTag.IndexOf(':') + 1)..];
var digest = (await (client ??= GetClient()).GetArtifact(name, tag).GetManifestPropertiesAsync(cts.Token)).Value.Digest;
var digest = (await acrGetDigestRetryPolicy.ExecuteAsync(token => (client ??= GetClient()).GetArtifact(name, tag).GetManifestPropertiesAsync(token), cts.Token)).Value.Digest;
settings["ActualCromwellImageName"] = $"{acr.Data.LoginServer}/{name}@{digest}";
}

Expand Down