-
Notifications
You must be signed in to change notification settings - Fork 580
[flaky-ci] Atomically replace Android SDK packages #12767
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
simonrozsival
wants to merge
1
commit into
main
Choose a base branch
from
simonrozsival-flaky-ci-android-sdk-cleanup
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
36 changes: 36 additions & 0 deletions
36
...droid.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/RemoveDirectoryBackups.cs
This file contains hidden or 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,36 @@ | ||
| using System; | ||
| using System.IO; | ||
| using Microsoft.Build.Framework; | ||
|
|
||
| namespace Xamarin.Android.Tools.BootstrapTasks | ||
| { | ||
| public sealed class RemoveDirectoryBackups : RetryingDirectoryTask | ||
| { | ||
| [Required] | ||
| public ITaskItem [] Directories { get; set; } = []; | ||
|
|
||
| public override bool Execute () | ||
| { | ||
| if (!ValidateRetryParameters ()) | ||
| return false; | ||
|
|
||
| foreach (var item in Directories) { | ||
| var directory = NormalizeDirectoryPath (item.ItemSpec); | ||
| var parentDirectory = Path.GetDirectoryName (directory); | ||
| if (string.IsNullOrEmpty (parentDirectory) || !Directory.Exists (parentDirectory)) | ||
| continue; | ||
|
|
||
| var directoryName = Path.GetFileName (directory); | ||
| foreach (var backupDirectory in Directory.GetDirectories (parentDirectory, $"{directoryName}.old-*", SearchOption.TopDirectoryOnly)) { | ||
| if (!TryDeleteDirectoryWithRetry (backupDirectory, out var deleteError)) { | ||
| Log.LogWarning ( | ||
| $"Could not remove old directory '{backupDirectory}' after {RetryCount + 1} attempts: " + | ||
| $"{deleteError.Message}{GetRemainingEntries (backupDirectory)}"); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return !Log.HasLoggedErrors; | ||
| } | ||
| } | ||
| } |
84 changes: 84 additions & 0 deletions
84
...rin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/ReplaceDirectory.cs
This file contains hidden or 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,84 @@ | ||
| using System; | ||
| using System.IO; | ||
| using Microsoft.Build.Framework; | ||
| using Microsoft.Build.Utilities; | ||
|
|
||
| namespace Xamarin.Android.Tools.BootstrapTasks | ||
| { | ||
| public class ReplaceDirectory : RetryingDirectoryTask | ||
| { | ||
| [Required] | ||
| public string SourceDirectory { get; set; } = ""; | ||
|
|
||
| [Required] | ||
| public string DestinationDirectory { get; set; } = ""; | ||
|
|
||
| [Required] | ||
| public string RequiredFile { get; set; } = ""; | ||
|
|
||
| public override bool Execute () | ||
| { | ||
| if (!ValidateRetryParameters ()) | ||
| return false; | ||
|
|
||
| var sourceDirectory = NormalizeDirectoryPath (SourceDirectory); | ||
| var destinationDirectory = NormalizeDirectoryPath (DestinationDirectory); | ||
| if (!Directory.Exists (sourceDirectory)) { | ||
| Log.LogError ($"Source directory '{sourceDirectory}' does not exist."); | ||
| return false; | ||
| } | ||
| if (!File.Exists (Path.Combine (sourceDirectory, RequiredFile))) { | ||
| Log.LogError ($"Source directory '{sourceDirectory}' does not contain required file '{RequiredFile}'."); | ||
| return false; | ||
| } | ||
|
|
||
| var parentDirectory = Path.GetDirectoryName (destinationDirectory); | ||
| if (!string.IsNullOrEmpty (parentDirectory)) | ||
| Directory.CreateDirectory (parentDirectory); | ||
|
|
||
| string backupDirectory = null; | ||
| try { | ||
| if (Directory.Exists (destinationDirectory)) { | ||
| var candidate = destinationDirectory + $".old-{Guid.NewGuid ():N}"; | ||
| MoveDirectoryWithRetry (destinationDirectory, candidate); | ||
| backupDirectory = candidate; | ||
| } | ||
|
|
||
| try { | ||
| MoveDirectoryWithRetry (sourceDirectory, destinationDirectory); | ||
| } catch { | ||
| RestoreBackup (backupDirectory, destinationDirectory); | ||
| throw; | ||
| } | ||
| } catch (Exception e) { | ||
| Log.LogError ($"Failed to replace directory '{destinationDirectory}' with '{sourceDirectory}': {e.Message}"); | ||
| return false; | ||
| } | ||
|
|
||
| if (backupDirectory != null && !TryDeleteDirectoryWithRetry (backupDirectory, out var deleteError)) { | ||
| Log.LogWarning ( | ||
| $"Installed '{destinationDirectory}', but could not remove old directory '{backupDirectory}' after {RetryCount + 1} attempts: " + | ||
| $"{deleteError.Message}{GetRemainingEntries (backupDirectory)}"); | ||
| } | ||
|
|
||
| return !Log.HasLoggedErrors; | ||
| } | ||
|
|
||
| void RestoreBackup (string backupDirectory, string destinationDirectory) | ||
| { | ||
| if (backupDirectory == null || !Directory.Exists (backupDirectory)) | ||
| return; | ||
| if (Directory.Exists (destinationDirectory)) { | ||
| Log.LogError ($"Cannot restore previous directory from '{backupDirectory}' because '{destinationDirectory}' exists."); | ||
| return; | ||
| } | ||
| try { | ||
| MoveDirectoryWithRetry (backupDirectory, destinationDirectory); | ||
| Log.LogMessage (MessageImportance.Normal, $"Restored previous directory from '{backupDirectory}'."); | ||
| } catch (Exception e) { | ||
| Log.LogError ($"Failed to restore previous directory from '{backupDirectory}': {e.Message}"); | ||
| } | ||
| } | ||
|
|
||
| } | ||
| } |
103 changes: 103 additions & 0 deletions
103
...ndroid.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/RetryingDirectoryTask.cs
This file contains hidden or 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,103 @@ | ||
| using System; | ||
| using System.IO; | ||
| using System.Linq; | ||
| using System.Threading; | ||
| using Microsoft.Android.Build.Tasks; | ||
| using Microsoft.Build.Framework; | ||
| using Microsoft.Build.Utilities; | ||
|
|
||
| namespace Xamarin.Android.Tools.BootstrapTasks | ||
| { | ||
| public abstract class RetryingDirectoryTask : Task | ||
| { | ||
| public int RetryCount { get; set; } = 10; | ||
|
|
||
| public int RetryDelayMilliseconds { get; set; } = 200; | ||
|
|
||
| protected bool ValidateRetryParameters () | ||
| { | ||
| if (RetryCount < 0) { | ||
| Log.LogError ($"{nameof (RetryCount)} must be greater than or equal to zero."); | ||
| return false; | ||
| } | ||
| if (RetryDelayMilliseconds < 0) { | ||
| Log.LogError ($"{nameof (RetryDelayMilliseconds)} must be greater than or equal to zero."); | ||
| return false; | ||
| } | ||
| return true; | ||
| } | ||
|
|
||
| protected void MoveDirectoryWithRetry (string source, string destination) | ||
| { | ||
| for (int attempt = 0; ; attempt++) { | ||
| try { | ||
| MoveDirectory (source, destination); | ||
| return; | ||
| } catch (Exception e) when ((e is IOException || e is UnauthorizedAccessException) && attempt < RetryCount) { | ||
| Log.LogMessage ( | ||
| MessageImportance.Normal, | ||
| $"Could not move directory '{source}' to '{destination}' (attempt {attempt + 1} of {RetryCount + 1}): {e.Message} Retrying."); | ||
| Delay (RetryDelayMilliseconds * (attempt + 1)); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| protected bool TryDeleteDirectoryWithRetry (string directory, out Exception error) | ||
| { | ||
| error = null; | ||
| for (int attempt = 0; ; attempt++) { | ||
| try { | ||
| if (!Directory.Exists (directory)) | ||
| return true; | ||
| if (Path.DirectorySeparatorChar == '\\') | ||
| Files.SetDirectoryWriteable (directory); | ||
| DeleteDirectory (directory); | ||
| return true; | ||
| } catch (DirectoryNotFoundException) { | ||
| return true; | ||
| } catch (Exception e) when (e is IOException || e is UnauthorizedAccessException) { | ||
| error = e; | ||
| if (attempt >= RetryCount) | ||
| return false; | ||
| Log.LogMessage ( | ||
| MessageImportance.Normal, | ||
| $"Could not remove directory '{directory}' (attempt {attempt + 1} of {RetryCount + 1}): {e.Message} Retrying."); | ||
| Delay (RetryDelayMilliseconds * (attempt + 1)); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| protected static string GetRemainingEntries (string directory) | ||
| { | ||
| try { | ||
| var entries = Directory.EnumerateFileSystemEntries (directory, "*", SearchOption.AllDirectories) | ||
| .Take (10) | ||
| .Select (path => $"'{path}'") | ||
| .ToArray (); | ||
| return entries.Length == 0 ? "" : $" Remaining entries: {string.Join (", ", entries)}."; | ||
| } catch (Exception e) { | ||
| return $" Remaining entries could not be enumerated: {e.Message}"; | ||
| } | ||
| } | ||
|
|
||
| protected static string NormalizeDirectoryPath (string directory) | ||
| { | ||
| return Path.TrimEndingDirectorySeparator (Path.GetFullPath (directory)); | ||
| } | ||
|
|
||
| protected virtual void MoveDirectory (string source, string destination) | ||
| { | ||
| Directory.Move (source, destination); | ||
| } | ||
|
|
||
| protected virtual void DeleteDirectory (string directory) | ||
| { | ||
| Directory.Delete (directory, recursive: true); | ||
| } | ||
|
|
||
| protected virtual void Delay (int milliseconds) | ||
| { | ||
| Thread.Sleep (milliseconds); | ||
| } | ||
| } | ||
| } |
This file contains hidden or 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.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is there a way we could implement this without using two new MSBuild tasks? Can the built-in MSBuild ones work for this?