-
Notifications
You must be signed in to change notification settings - Fork 312
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
Fix handler when install script makes an incomplete install #2106
Draft
nagilson
wants to merge
4
commits into
dotnet:main
Choose a base branch
from
nagilson:nagilson-fix-missing-dir
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.
+159
−132
Draft
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
ba54094
Refactor locking logic into its own class so we can use it elsewhere
nagilson f320a62
Add a mutex for the local installation directory and then wipe it if …
nagilson ed91762
Merge remote-tracking branch 'upstream/main' into HEAD
nagilson 4da19c6
Fix some of the logic
nagilson 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
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
63 changes: 63 additions & 0 deletions
63
vscode-dotnet-runtime-library/src/Acquisition/LockUtilities.ts
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,63 @@ | ||
| /*--------------------------------------------------------------------------------------------- | ||
| * Licensed to the .NET Foundation under one or more agreements. | ||
| * The .NET Foundation licenses this file to you under the MIT license. | ||
| *--------------------------------------------------------------------------------------------*/ | ||
| import * as fs from 'fs'; | ||
| import * as lockfile from 'proper-lockfile'; | ||
| import * as path from 'path'; | ||
| import { | ||
| DotnetLockAttemptingAcquireEvent, | ||
| DotnetLockErrorEvent, | ||
| DotnetLockReleasedEvent, | ||
| EventBasedError, | ||
| } from '../EventStream/EventStreamEvents'; | ||
| import { IEventStream } from '../EventStream/EventStream'; | ||
|
|
||
| export async function executeWithLock<A extends any[], R>(eventStream : IEventStream, alreadyHoldingLock : boolean, dataKey : string, f: (...args: A) => R, ...args: A): Promise<R> | ||
| { | ||
| const trackingLock = `${dataKey}.lock`; | ||
| const lockPath = path.join(__dirname, trackingLock); | ||
| fs.writeFileSync(lockPath, '', 'utf-8'); | ||
|
|
||
| let returnResult : any; | ||
|
|
||
| try | ||
| { | ||
| if(alreadyHoldingLock) | ||
| { | ||
| // eslint-disable-next-line @typescript-eslint/await-thenable | ||
| return await f(...(args)); | ||
| } | ||
| else | ||
| { | ||
| eventStream?.post(new DotnetLockAttemptingAcquireEvent(`Lock Acquisition request to begin.`, new Date().toISOString(), lockPath, lockPath)); | ||
| await lockfile.lock(lockPath, { retries: { retries: 10, minTimeout: 5, maxTimeout: 10000 } }) | ||
| .then(async (release) => | ||
| { | ||
| // eslint-disable-next-line @typescript-eslint/await-thenable | ||
| returnResult = await f(...(args)); | ||
| eventStream?.post(new DotnetLockReleasedEvent(`Lock about to be released.`, new Date().toISOString(), lockPath, lockPath)); | ||
| return release(); | ||
| }) | ||
| .catch((e : Error) => | ||
| { | ||
| // Either the lock could not be acquired or releasing it failed | ||
| eventStream?.post(new DotnetLockErrorEvent(e, e.message, new Date().toISOString(), lockPath, lockPath)); | ||
| }); | ||
| } | ||
| } | ||
| catch(e : any) | ||
| { | ||
| // Either the lock could not be acquired or releasing it failed | ||
|
|
||
| // Remove this when https://github.com/typescript-eslint/typescript-eslint/issues/2728 is done | ||
| // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access | ||
| eventStream.post(new DotnetLockErrorEvent(e, e?.message ?? 'Unable to acquire lock to update installation state', new Date().toISOString(), lockPath, lockPath)); | ||
|
|
||
| // Remove this when https://github.com/typescript-eslint/typescript-eslint/issues/2728 is done | ||
| // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access | ||
| throw new EventBasedError('DotnetLockErrorEvent', e?.message, e?.stack); | ||
| } | ||
|
|
||
| return returnResult; | ||
| } |
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.
What if it failed to write all of the binary? might wanna check that executing this also gives a 0 status code like dotnet --info or smth if it does exist.