Commitcd845d4

authored

fix: fix daemon.lock race on mutagen startup (#101)

I found the source of the issue where mutagen would fail to acquire the lock on `daemon.lock` at startup.The MutagenClient attempts to lock the `daemon.lock` file while it is starting, so that it can fail fast if the daemon is not running.While well meaning, this creates a race condition because as soon as we start the daemon process we create a MutagenClient so that we can talk to the daemon over its API. The MutagenClient might be holding the lock or have the lockfile open at the exact moment the daemon itself attempts to acquire and lock the file. The daemon immediately exits in that case and doesn't retry locking the file.I've just removed the preflight checks on the `daemon.lock`, since we don't want Coder Desktop to ever mess with that file (outside of tests).

1 parent6b3851d commitcd845d4Copy full SHA for cd845d4

File tree

2 files changed

-20

lines changed

App/Services
- MutagenController.cs
MutagenSdk
- MutagenClient.cs

2 files changed

-20

lines changed

`‎App/Services/MutagenController.cs`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -441,6 +441,7 @@ private async Task<SyncSessionControllerStateModel> UpdateState(MutagenClient cl`
`441`	`441`	`/// </summary>`
`442`	`442`	`privateasyncTask<MutagenClient>EnsureDaemon(CancellationTokenct)`
`443`	`443`	`{`
	`444`	`+_logger.LogDebug("EnsureDaemon called");`
`444`	`445`	`ObjectDisposedException.ThrowIf(_disposing,typeof(MutagenController));`
`445`	`446`	`if(_mutagenClient!=null&&_daemonProcess!=null)`
`446`	`447`	`return_mutagenClient;`
`@@ -479,12 +480,14 @@ private async Task<MutagenClient> EnsureDaemon(CancellationToken ct)`
`479`	`480`	`/// </summary>`
`480`	`481`	`privateasyncTask<MutagenClient>StartDaemon(CancellationTokenct)`
`481`	`482`	`{`
	`483`	`+_logger.LogDebug("StartDaemon called");`
`482`	`484`	`// Stop the running daemon`
`483`	`485`	`if(_daemonProcess!=null)awaitStopDaemon(ct);`
`484`	`486`
`485`	`487`	`// Attempt to stop any orphaned daemon`
`486`	`488`	`try`
`487`	`489`	`{`
	`490`	`+_logger.LogDebug("creating MutagenClient to stop orphan");`
`488`	`491`	`varclient=newMutagenClient(_mutagenDataDirectory);`
`489`	`492`	`awaitclient.Daemon.TerminateAsync(newDaemonTerminateRequest(),cancellationToken:ct);`
`490`	`493`	`}`
`@@ -496,6 +499,10 @@ private async Task<MutagenClient> StartDaemon(CancellationToken ct)`
`496`	`499`	`{`
`497`	`500`	`// Mainline; no daemon running.`
`498`	`501`	`}`
	`502`	`+finally`
	`503`	`+{`
	`504`	`+_logger.LogDebug("finished with orphan mutagen client");`
	`505`	`+}`
`499`	`506`
`500`	`507`	`// If we get some failure while creating the log file or starting the process, we'll retry`
`501`	`508`	`// it up to 5 times x 100ms. Those issues should resolve themselves quickly if they are`
`@@ -528,6 +535,7 @@ private async Task<MutagenClient> StartDaemon(CancellationToken ct)`
`528`	`535`	`ct.ThrowIfCancellationRequested();`
`529`	`536`	`try`
`530`	`537`	`{`
	`538`	`+_logger.LogDebug("creating mainline mutagen client");`
`531`	`539`	`varclient=newMutagenClient(_mutagenDataDirectory);`
`532`	`540`	`_=awaitclient.Daemon.VersionAsync(newVersionRequest(),cancellationToken:ct);`
`533`	`541`	`_mutagenClient=client;`

`‎MutagenSdk/MutagenClient.cs`

Lines changed: 0 additions & 20 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,26 +16,6 @@ public class MutagenClient : IDisposable`
`16`	`16`
`17`	`17`	`publicMutagenClient(stringdataDir)`
`18`	`18`	`{`
`19`		`-// Check for the lock file first, since it should exist if it's running.`
`20`		`-vardaemonLockFile=Path.Combine(dataDir,"daemon","daemon.lock");`
`21`		`-if(!File.Exists(daemonLockFile))`
`22`		`-thrownewFileNotFoundException(`
`23`		`-"Mutagen daemon lock file not found, did the mutagen daemon start successfully?",daemonLockFile);`
`24`		`-`
`25`		`-// We should not be able to open the lock file.`
`26`		`-try`
`27`		`-{`
`28`		`-usingvar_=File.Open(daemonLockFile,FileMode.Open,FileAccess.Write,FileShare.None);`
`29`		`-// We throw a FileNotFoundException if we could open the file because`
`30`		`-// it means the same thing and allows us to return the path nicely.`
`31`		`-thrownewInvalidOperationException(`
`32`		`-$"Mutagen daemon lock file '{daemonLockFile}' is unlocked, did the mutagen daemon start successfully?");`
`33`		`-}`
`34`		`-catch(IOException)`
`35`		`-{`
`36`		`-// this is what we expect`
`37`		`-}`
`38`		`-`
`39`	`19`	`// Read the IPC named pipe address from the sock file.`
`40`	`20`	`vardaemonSockFile=Path.Combine(dataDir,"daemon","daemon.sock");`
`41`	`21`	`if(!File.Exists(daemonSockFile))`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitcd845d4

File tree

2 files changed

2 files changed

`‎App/Services/MutagenController.cs`

`‎MutagenSdk/MutagenClient.cs`

0 commit comments