Removing constraint from templates to avoid SDK multithreading issue #4176
Conversation
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
phenning
approved these changes
May 14, 2024
Forgind
approved these changes
May 14, 2024
DamianEdwards
approved these changes
May 14, 2024
|
/backport to release/8.0 |
|
Started backporting to release/8.0: https://github.com/dotnet/aspire/actions/runs/9089407386 |
|
@joperezr backporting to release/8.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Removing constraint from templates to avoid SDK multithreading issue
Using index info to reconstruct a base tree...
A src/Aspire.ProjectTemplates/templates/aspire-mstest/.template.config/template.json
A src/Aspire.ProjectTemplates/templates/aspire-nunit/.template.config/template.json
M src/Aspire.ProjectTemplates/templates/aspire-starter/.template.config/template.json
M src/Aspire.ProjectTemplates/templates/aspire-xunit/.template.config/template.json
Falling back to patching base and 3-way merge...
Auto-merging src/Aspire.ProjectTemplates/templates/aspire-xunit/.template.config/template.json
CONFLICT (content): Merge conflict in src/Aspire.ProjectTemplates/templates/aspire-xunit/.template.config/template.json
Auto-merging src/Aspire.ProjectTemplates/templates/aspire-starter/.template.config/template.json
CONFLICT (modify/delete): src/Aspire.ProjectTemplates/templates/aspire-nunit/.template.config/template.json deleted in HEAD and modified in Removing constraint from templates to avoid SDK multithreading issue. Version Removing constraint from templates to avoid SDK multithreading issue of src/Aspire.ProjectTemplates/templates/aspire-nunit/.template.config/template.json left in tree.
CONFLICT (modify/delete): src/Aspire.ProjectTemplates/templates/aspire-mstest/.template.config/template.json deleted in HEAD and modified in Removing constraint from templates to avoid SDK multithreading issue. Version Removing constraint from templates to avoid SDK multithreading issue of src/Aspire.ProjectTemplates/templates/aspire-mstest/.template.config/template.json left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Removing constraint from templates to avoid SDK multithreading issue
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@joperezr an error occurred while backporting to release/8.0, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Works around #4145.
@dsplaisted has done a full diagnosis of the issue here, but the TL;DR is that there seems to be a multi-threading issue inside the SDK, particularly in their logic that tries to check for installed workloads. Aspire templates today have a constraint to show these templates only when the aspire workload is installed, which is technically unrequired as the templates get installed via the workload anyway. By adding this constraint, we are forcing the piece of code in the SDK with the race condition, which will make it so that around 50% of the time, aspire template creation will fail. The SDK team will fix this bug in servicing, but in the meantime we are working around the bug by removing the unnecessary constraint from our templates.
We expect a lot of people will hit this issue (essentially anyone creating aspire projects from the command line), so we'll want to service this to 8.0.1 release. (FYI: @danmoseley )
cc: @DamianEdwards @phenning
Microsoft Reviewers: Open in CodeFlow