Fix concurrent NpgsqlDataSource.Dispose and Bootstrap (#6116)

vonzshik · vonzshik · commit 2781000307f4 · 2025-08-20T12:46:51.000+03:00
Fixes #6115 (cherry picked from commit 6f8971c)
diff --git a/src/Npgsql/NpgsqlDataSource.cs b/src/Npgsql/NpgsqlDataSource.cs
@@ -473,8 +473,10 @@ protected virtual void DisposeBase()
         }
 
         _periodicPasswordProviderTimer?.Dispose();
-        _setupMappingsSemaphore.Dispose();
         MetricsReporter.Dispose();
+        // We do not dispose _setupMappingsSemaphore explicitly, leaving it to finalizer
+        // Due to possible concurrent access, which might lead to deadlock
+        // See issue #6115
 
         Clear();
     }
@@ -508,8 +510,10 @@ protected virtual async ValueTask DisposeAsyncBase()
 #endif
         }
 
-        _setupMappingsSemaphore.Dispose();
         MetricsReporter.Dispose();
+        // We do not dispose _setupMappingsSemaphore explicitly, leaving it to finalizer
+        // Due to possible concurrent access, which might lead to deadlock
+        // See issue #6115
 
         // TODO: async Clear, #4499
         Clear();

Original file line number	Diff line number	Diff line change
`@@ -473,8 +473,10 @@ protected virtual void DisposeBase()`
`473`	`473`	`}`
`474`	`474`
`475`	`475`	`_periodicPasswordProviderTimer?.Dispose();`
`476`		`- _setupMappingsSemaphore.Dispose();`
`477`	`476`	`MetricsReporter.Dispose();`
	`477`	`+ // We do not dispose _setupMappingsSemaphore explicitly, leaving it to finalizer`
	`478`	`+ // Due to possible concurrent access, which might lead to deadlock`
	`479`	`+ // See issue #6115`
`478`	`480`
`479`	`481`	`Clear();`
`480`	`482`	`}`
`@@ -508,8 +510,10 @@ protected virtual async ValueTask DisposeAsyncBase()`
`508`	`510`	`#endif`
`509`	`511`	`}`
`510`	`512`
`511`		`- _setupMappingsSemaphore.Dispose();`
`512`	`513`	`MetricsReporter.Dispose();`
	`514`	`+ // We do not dispose _setupMappingsSemaphore explicitly, leaving it to finalizer`
	`515`	`+ // Due to possible concurrent access, which might lead to deadlock`
	`516`	`+ // See issue #6115`
`513`	`517`
`514`	`518`	`// TODO: async Clear, #4499`
`515`	`519`	`Clear();`