Improve MSStore installation success rate by trying Restart or Cancel when applicable #4356
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
JohnMcPMS
reviewed
Apr 8, 2024
| [&]() | ||
| { | ||
| AppInstallManager installManager; | ||
| installManager.Cancel(m_productId); |
There was a problem hiding this comment.
We probably want to try/catch this whole lambda to prevent any errors from potentially terminating the process.
JohnMcPMS
previously approved these changes
Apr 8, 2024
JohnMcPMS
reviewed
Apr 8, 2024
|
|
||
| for (auto const& installItem : installItems) | ||
| { | ||
| if (Utility::CaseInsensitiveEquals(Utility::ConvertToUTF8(installItem.ProductId()), productId)) |
There was a problem hiding this comment.
This seems like a lot of string conversions to avoid having a CaseInsensitiveEquals(wstring_view, wstring_view).
| // Wait for at most 10 seconds for install item to be removed from queue. | ||
| for (int i = 0; i < 20; ++i) | ||
| { | ||
| Sleep(500); |
There was a problem hiding this comment.
Suggested change
| Sleep(500); | |
| Sleep(200); |
And the appropriate loop count to get back to 10 seconds.
| } | ||
| } | ||
|
|
||
| return HRESULT_FROM_WIN32(ERROR_TIMEOUT); |
There was a problem hiding this comment.
Suggested change
| return HRESULT_FROM_WIN32(ERROR_TIMEOUT); | |
| RETURN_HR(HRESULT_FROM_WIN32(ERROR_TIMEOUT)); |
Comment on lines
239
to
242
| if (FAILED(restartOrCancelResult)) | ||
| { | ||
| // Wait a bit | ||
| Sleep(500); | ||
| return restartOrCancelResult; | ||
| } |
There was a problem hiding this comment.
Get rid of this and just us RETURN_IF_FAILED on the call to RestartOrCancelExistingOperationIfNecessary.
JohnMcPMS
approved these changes
Apr 8, 2024
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
yao-msft
added a commit
to yao-msft/winget-cli
that referenced
this pull request
Apr 9, 2024
… when applicable (microsoft#4356) After calling to InstallProductAsync, try to check status of existing install items and call Restart or Cancel if applicable. After our operation failed, clean up the installation queue by calling cancel. I manually validated by opening Store app, install a test app and pause the installation. Then use winget to install the same app. App installation failed before the change and succeeded after the change. ###### Microsoft Reviewers: [Open in CodeFlow](https://microsoft.github.io/open-pr/?codeflow=https://github.com/microsoft/winget-cli/pull/4356)
yao-msft
added a commit
that referenced
this pull request
Apr 9, 2024
… when applicable (#4356) After calling to InstallProductAsync, try to check status of existing install items and call Restart or Cancel if applicable. After our operation failed, clean up the installation queue by calling cancel. I manually validated by opening Store app, install a test app and pause the installation. Then use winget to install the same app. App installation failed before the change and succeeded after the change. ###### Microsoft Reviewers: [Open in CodeFlow](https://microsoft.github.io/open-pr/?codeflow=https://github.com/microsoft/winget-cli/pull/4356)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
After calling to InstallProductAsync, try to check status of existing install items and call Restart or Cancel if applicable.
After our operation failed, clean up the installation queue by calling cancel.
I manually validated by opening Store app, install a test app and pause the installation. Then use winget to install the same app. App installation failed before the change and succeeded after the change.
Microsoft Reviewers: Open in CodeFlow