Merge branch 'ravendb-teardown-during-stop-sequence' into spike-ravendb-termination

ramonsmits · ramonsmits · commit 9dfb7aa3ee68 · 2025-02-20T18:43:25.000+01:00
diff --git a/src/ServiceControl.RavenDB/EmbeddedDatabase.cs b/src/ServiceControl.RavenDB/EmbeddedDatabase.cs
@@ -206,6 +206,9 @@ public async Task Stop(CancellationToken cancellationToken)
                     Logger.WarnFormat("Killing RavenDB server PID {0} child process because host cancelled", processId);
                     var ravenChildProcess = Process.GetProcessById(processId);
                     ravenChildProcess.Kill(entireProcessTree: true);
+                    // Kill only signals
+                    Logger.WarnFormat("Waiting for RavenDB server PID {0} to exit... ", processId);
+                    await ravenChildProcess.WaitForExitAsync(CancellationToken.None);
                 }
                 catch (Exception e)
                 {

Original file line number	Diff line number	Diff line change
`@@ -206,6 +206,9 @@ public async Task Stop(CancellationToken cancellationToken)`
`206`	`206`	`Logger.WarnFormat("Killing RavenDB server PID {0} child process because host cancelled", processId);`
`207`	`207`	`var ravenChildProcess = Process.GetProcessById(processId);`
`208`	`208`	`ravenChildProcess.Kill(entireProcessTree: true);`
	`209`	`+ // Kill only signals`
	`210`	`+ Logger.WarnFormat("Waiting for RavenDB server PID {0} to exit... ", processId);`
	`211`	`+ await ravenChildProcess.WaitForExitAsync(CancellationToken.None);`
`209`	`212`	`}`
`210`	`213`	`catch (Exception e)`
`211`	`214`	`{`