We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent 1d1193d commit 6c61398Copy full SHA for 6c61398
go/kbfs/libkbfs/conflict_resolver.go
@@ -311,6 +311,11 @@ func (cr *ConflictResolver) Wait(ctx context.Context) error {
311
// goroutines.
312
func (cr *ConflictResolver) Shutdown() {
313
cr.stopProcessing()
314
+ cr.ForceCancel()
315
+ // Wait for all resolution goroutines to finish before returning.
316
+ // This prevents the DB from being closed while goroutines are still
317
+ // trying to write to it (which would cause a panic).
318
+ _ = cr.resolveGroup.Wait(context.Background())
319
}
320
321
// Pause cancels any ongoing resolutions and prevents any new ones from
0 commit comments