Hide task scheduler when using Task.Factory.FromAsync as can causes x…

…unit deadlocks on low CPU core runs
dotnet · Aug 3, 2022 · 3899f44 · 3899f44
1 parent 54f8eb1
commit 3899f44
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/System.Private.ServiceModel/src/Internals/System/Runtime/TaskHelpers.cs b/src/System.Private.ServiceModel/src/Internals/System/Runtime/TaskHelpers.cs
@@ -196,7 +196,7 @@ public static Task CloseHelperAsync(this ICommunicationObject communicationObjec
             }
             else
             {
-                return Task.Factory.FromAsync(communicationObject.BeginClose, communicationObject.EndClose, timeout, null);
+                return Task.Factory.FromAsync(communicationObject.BeginClose, communicationObject.EndClose, timeout, null, TaskCreationOptions.HideScheduler);
             }
         }
 
@@ -208,7 +208,7 @@ public static Task OpenHelperAsync(this ICommunicationObject communicationObject
             }
             else
             {
-                return Task.Factory.FromAsync(communicationObject.BeginOpen, communicationObject.EndOpen, timeout, null);
+                return Task.Factory.FromAsync(communicationObject.BeginOpen, communicationObject.EndOpen, timeout, null, TaskCreationOptions.HideScheduler);
             }
         }
 

diff --git a/src/System.Private.ServiceModel/tests/Common/Infrastructure/xunit/WcfTestCase.cs b/src/System.Private.ServiceModel/tests/Common/Infrastructure/xunit/WcfTestCase.cs
@@ -51,7 +51,7 @@ public override async Task<RunSummary> RunAsync(
             ConcurrentQueue<EventWrittenEventArgs> events = new ConcurrentQueue<EventWrittenEventArgs>();
 	        s_testListener.EventWritten = events.Enqueue;
             Timer timer = null;
-            if (_failFastDuration != System.Threading.Timeout.InfiniteTimeSpan)
+            if (_failFastDuration != System.Threading.Timeout.InfiniteTimeSpan && !System.Diagnostics.Debugger.IsAttached)
             {
                 timer = new Timer((s) => Environment.FailFast("Test timed out"),
                                   null,