-
Notifications
You must be signed in to change notification settings - Fork 865
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* WIP * Refactoring * Refactor tool download code * Refactor + Add tests * Fix test * Change RetryOptions to record to be able to use default ToString override for logging --------- Co-authored-by: v-levockina <undefined> Co-authored-by: Kirill Ivlev <102740624+kirill-ivlev@users.noreply.github.com>
- Loading branch information
1 parent
e44cd18
commit 39c297f
Showing
16 changed files
with
334 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,130 @@ | ||
| using Microsoft.VisualStudio.Services.Agent.Util; | ||
| using System; | ||
| using System.IO; | ||
| using System.IO.Compression; | ||
| using System.Net.Http; | ||
| using System.Threading; | ||
| using System.Threading.Tasks; | ||
|
|
||
| namespace Microsoft.VisualStudio.Services.Agent.Worker | ||
| { | ||
| public interface IRetryOptions | ||
| { | ||
| int CurrentCount { get; set; } | ||
| int Limit { get; init; } | ||
| } | ||
|
|
||
| public record RetryOptions : IRetryOptions | ||
| { | ||
| public int CurrentCount { get; set; } | ||
| public int Limit { get; init; } | ||
| } | ||
|
|
||
| public static class TfManager | ||
| { | ||
| public static async Task DownloadLegacyTfToolsAsync(IExecutionContext executionContext) | ||
| { | ||
| ArgUtil.NotNull(executionContext, nameof(executionContext)); | ||
| string externalsPath = Path.Combine(executionContext.GetVariableValueOrDefault("Agent.HomeDirectory"), Constants.Path.ExternalsDirectory); | ||
| ArgUtil.NotNull(externalsPath, nameof(externalsPath)); | ||
|
|
||
| string tfLegacyExternalsPath = Path.Combine(externalsPath, "tf-legacy"); | ||
| var retryOptions = new RetryOptions() { CurrentCount = 0, Limit = 3 }; | ||
|
|
||
| if (!Directory.Exists(tfLegacyExternalsPath)) | ||
| { | ||
| const string tfDownloadUrl = "https://vstsagenttools.blob.core.windows.net/tools/vstsom/m153_47c0856d/vstsom.zip"; | ||
| string tempTfDirectory = Path.Combine(externalsPath, "tf_download_temp"); | ||
|
|
||
| await DownloadAsync(executionContext, tfDownloadUrl, tempTfDirectory, tfLegacyExternalsPath, retryOptions); | ||
| } | ||
| else | ||
| { | ||
| executionContext.Debug($"tf-legacy download already exists at {tfLegacyExternalsPath}."); | ||
| } | ||
|
|
||
| string vstsomLegacyExternalsPath = Path.Combine(externalsPath, "vstsom-legacy"); | ||
|
|
||
| if (!Directory.Exists(vstsomLegacyExternalsPath)) | ||
| { | ||
| const string vstsomDownloadUrl = "https://vstsagenttools.blob.core.windows.net/tools/vstsom/m122_887c6659/vstsom.zip"; | ||
| string tempVstsomDirectory = Path.Combine(externalsPath, "vstsom_download_temp"); | ||
|
|
||
| await DownloadAsync(executionContext, vstsomDownloadUrl, tempVstsomDirectory, vstsomLegacyExternalsPath, retryOptions); | ||
| } | ||
| else | ||
| { | ||
| executionContext.Debug($"vstsom-legacy download already exists at {vstsomLegacyExternalsPath}."); | ||
| } | ||
| } | ||
|
|
||
| public static async Task DownloadAsync(IExecutionContext executionContext, string blobUrl, string tempDirectory, string extractPath, IRetryOptions retryOptions) | ||
| { | ||
| Directory.CreateDirectory(tempDirectory); | ||
| string downloadPath = Path.ChangeExtension(Path.Combine(tempDirectory, "download"), ".completed"); | ||
| string toolName = new DirectoryInfo(extractPath).Name; | ||
|
|
||
| const int timeout = 180; | ||
| const int defaultFileStreamBufferSize = 4096; | ||
| const int retryDelay = 10000; | ||
|
|
||
| try | ||
| { | ||
| using CancellationTokenSource downloadCts = new(TimeSpan.FromSeconds(timeout)); | ||
| using CancellationTokenSource linkedTokenSource = CancellationTokenSource.CreateLinkedTokenSource(downloadCts.Token, executionContext.CancellationToken); | ||
| CancellationToken cancellationToken = linkedTokenSource.Token; | ||
|
|
||
| using HttpClient httpClient = new(); | ||
| using Stream stream = await httpClient.GetStreamAsync(blobUrl, cancellationToken); | ||
| using FileStream fs = new(downloadPath, FileMode.Create, FileAccess.Write, FileShare.None, bufferSize: defaultFileStreamBufferSize, useAsync: true); | ||
|
|
||
| while (retryOptions.CurrentCount < retryOptions.Limit) | ||
| { | ||
| try | ||
| { | ||
| executionContext.Debug($"Retry options: {retryOptions.ToString()}."); | ||
| await stream.CopyToAsync(fs, cancellationToken); | ||
| executionContext.Debug($"Finished downloading {toolName}."); | ||
| await fs.FlushAsync(cancellationToken); | ||
| fs.Close(); | ||
| break; | ||
| } | ||
| catch (OperationCanceledException) when (cancellationToken.IsCancellationRequested) | ||
| { | ||
| executionContext.Debug($"{toolName} download has been cancelled."); | ||
| throw; | ||
| } | ||
| catch (Exception) | ||
| { | ||
| retryOptions.CurrentCount++; | ||
|
|
||
| if (retryOptions.CurrentCount == retryOptions.Limit) | ||
| { | ||
| IOUtil.DeleteDirectory(tempDirectory, CancellationToken.None); | ||
| executionContext.Error($"Retry limit for {toolName} download has been exceeded."); | ||
| return; | ||
| } | ||
|
|
||
| executionContext.Debug($"Failed to download {toolName}"); | ||
| executionContext.Debug($"Retry {toolName} download in 10 seconds."); | ||
| await Task.Delay(retryDelay, cancellationToken); | ||
| } | ||
| } | ||
|
|
||
| executionContext.Debug($"Extracting {toolName}..."); | ||
| ZipFile.ExtractToDirectory(downloadPath, extractPath); | ||
| File.WriteAllText(downloadPath, DateTime.UtcNow.ToString()); | ||
| executionContext.Debug($"{toolName} has been extracted and cleaned up"); | ||
| } | ||
| catch (Exception ex) | ||
| { | ||
| executionContext.Error(ex); | ||
| } | ||
| finally | ||
| { | ||
| IOUtil.DeleteDirectory(tempDirectory, CancellationToken.None); | ||
| executionContext.Debug($"{toolName} download directory has been cleaned up."); | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.