Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Increase CoreCLR dump information #49790

Merged
1 commit merged into from
Dec 4, 2020
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions src/Tools/Source/RunTests/ProcessTestExecutor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
using System.Collections.Immutable;
using System.IO;
using System.Linq;
using System.Runtime.InteropServices;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
Expand Down Expand Up @@ -120,6 +121,7 @@ private async Task<TestResult> RunTestAsyncInternal(AssemblyInfo assemblyInfo, b
// Define environment variables for processes started via ProcessRunner.
var environmentVariables = new Dictionary<string, string>();
Options.ProcDumpInfo?.WriteEnvironmentVariables(environmentVariables);
MaybeAddStressEnvironmentVariables();

if (retry && File.Exists(resultsFilePath))
{
Expand Down Expand Up @@ -216,6 +218,23 @@ private async Task<TestResult> RunTestAsyncInternal(AssemblyInfo assemblyInfo, b
testResultInfo,
commandLineArguments,
processResults: ImmutableArray.CreateRange(processResultList));

void MaybeAddStressEnvironmentVariables()
{
#if NETCOREAPP
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It just occurred to me that RunTests.dll itself always defines this symbol even if we are running net472 tests. May be more appropriate to check for the absence of "net472" in Options.TargetFrameworks

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doh! You're right I missed that. I will get that fixed up in a bit.

// These environment variables will generate better dump information for the runtime team
// that will help them track down a GC issue that is impacting ConcurrentDictionary
// https://github.com/dotnet/runtime/issues/45557
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for linking to the bug!

if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
environmentVariables.Add("COMPlus_StressLog", "1");
environmentVariables.Add("COMPlus_LogLevel", "6");
environmentVariables.Add("COMPlus_LogFacility", "0x00080001");
environmentVariables.Add("COMPlus_StressLogSize", "2000000");
environmentVariables.Add("COMPlus_TotalStressLogSize", "40000000");
}
}
#endif
}
catch (Exception ex)
{
Expand Down