Skip to content

Fix TransactionManager DefaultTimeout/MaximumTimeout setter race condition #130664

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.

Sign up for GitHub

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

Merged
jkotas merged 4 commits into from
Aug 3, 2026
Merged

Fix TransactionManager DefaultTimeout/MaximumTimeout setter race condition #130664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f280ef6
Initial plan
Copilot Jul 14, 2026
9b36fde
Fix TransactionManager race condition in DefaultTimeout/MaximumTimeou…
Copilot Jul 14, 2026
e02b92b
Restore original Interlocked.Read comparison in DefaultTimeout.set
Copilot Jul 29, 2026
57018be
Simplify TransactionManager timeout logic per @jkotas feedback
Copilot Aug 3, 2026
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
3 changes: 0 additions & 3 deletions src/libraries/System.Transactions.Local/src/System.Transactions.Local.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,6 @@
<Compile Include="System\Transactions\VolatileEnlistmentMultiplexing.cs" />
<Compile Include="System\Transactions\VolatileEnlistmentState.cs" />
<Compile Include="System\Transactions\Configuration\AppSettings.cs" />
<Compile Include="System\Transactions\Configuration\ConfigurationStrings.cs" />
<Compile Include="System\Transactions\Configuration\DefaultSettingsSection.cs" />
<Compile Include="System\Transactions\Configuration\MachineSettingsSection.cs" />
<Compile Include="$(CommonPath)System\Obsoletions.cs" Link="Common\System\Obsoletions.cs" />
</ItemGroup>

Expand Down
10 changes: 0 additions & 10 deletions ...s/System.Transactions.Local/src/System/Transactions/Configuration/ConfigurationStrings.cs
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions ...System.Transactions.Local/src/System/Transactions/Configuration/DefaultSettingsSection.cs
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions ...System.Transactions.Local/src/System/Transactions/Configuration/MachineSettingsSection.cs
View file
Open in desktop

This file was deleted.

65 changes: 22 additions & 43 deletions src/libraries/System.Transactions.Local/src/System/Transactions/TransactionManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
using System.IO;
using System.Runtime.Versioning;
using System.Threading;
using System.Transactions.Configuration;
#if WINDOWS
using System.Transactions.DtcProxyShim;
#endif
Expand Down Expand Up @@ -279,11 +278,7 @@ internal static IsolationLevel DefaultIsolationLevel
}
}

private static DefaultSettingsSection DefaultSettings => field ??= DefaultSettingsSection.GetSection();
private static MachineSettingsSection MachineSettings => field ??= MachineSettingsSection.GetSection();

private static bool s_defaultTimeoutValidated;
private static long s_defaultTimeoutTicks;
private static long s_defaultTimeoutTicks = TimeSpan.FromMinutes(1).Ticks;
public static TimeSpan DefaultTimeout
{
get
Expand All @@ -292,22 +287,6 @@ public static TimeSpan DefaultTimeout
if (etwLog.IsEnabled())
{
etwLog.MethodEnter(TraceSourceType.TraceSourceBase, "TransactionManager.get_DefaultTimeout");
}

if (!s_defaultTimeoutValidated)
{
LazyInitializer.EnsureInitialized(ref s_defaultTimeoutTicks, ref s_defaultTimeoutValidated, ref s_classSyncObject, () => ValidateTimeout(DefaultSettingsSection.Timeout).Ticks);
if (Interlocked.Read(ref s_defaultTimeoutTicks) != DefaultSettingsSection.Timeout.Ticks)
{
if (etwLog.IsEnabled())
{
etwLog.ConfiguredDefaultTimeoutAdjusted();
}
}
}

if (etwLog.IsEnabled())
{
etwLog.MethodExit(TraceSourceType.TraceSourceBase, "TransactionManager.get_DefaultTimeout");
}
return new TimeSpan(Interlocked.Read(ref s_defaultTimeoutTicks));
Expand All @@ -320,17 +299,21 @@ public static TimeSpan DefaultTimeout
etwLog.MethodEnter(TraceSourceType.TraceSourceBase, "TransactionManager.set_DefaultTimeout");
}

Interlocked.Exchange(ref s_defaultTimeoutTicks, ValidateTimeout(value).Ticks);
if (Interlocked.Read(ref s_defaultTimeoutTicks) != value.Ticks)
bool timeoutAdjusted;
lock (ClassSyncObject)
{
TimeSpan validatedTimeout = ValidateTimeout(value);
Interlocked.Exchange(ref s_defaultTimeoutTicks, validatedTimeout.Ticks);
timeoutAdjusted = validatedTimeout != value;
}
if (timeoutAdjusted)
{
if (etwLog.IsEnabled())
{
etwLog.ConfiguredDefaultTimeoutAdjusted();
}
}

s_defaultTimeoutValidated = true;

if (etwLog.IsEnabled())
{
etwLog.MethodExit(TraceSourceType.TraceSourceBase, "TransactionManager.set_DefaultTimeout");
Expand All @@ -339,8 +322,7 @@ public static TimeSpan DefaultTimeout
}


private static bool s_cachedMaxTimeout;
private static TimeSpan s_maximumTimeout;
private static long s_maximumTimeoutTicks = TimeSpan.FromMinutes(10).Ticks;
public static TimeSpan MaximumTimeout
{
get
Expand All @@ -349,16 +331,9 @@ public static TimeSpan MaximumTimeout
if (etwLog.IsEnabled())
{
etwLog.MethodEnter(TraceSourceType.TraceSourceBase, "TransactionManager.get_DefaultMaximumTimeout");
}

LazyInitializer.EnsureInitialized(ref s_maximumTimeout, ref s_cachedMaxTimeout, ref s_classSyncObject, () => MachineSettingsSection.MaxTimeout);

if (etwLog.IsEnabled())
{
etwLog.MethodExit(TraceSourceType.TraceSourceBase, "TransactionManager.get_DefaultMaximumTimeout");
}

return s_maximumTimeout;
return new TimeSpan(Interlocked.Read(ref s_maximumTimeoutTicks));
}
set
{
Expand All @@ -370,13 +345,17 @@ public static TimeSpan MaximumTimeout

ArgumentOutOfRangeException.ThrowIfLessThan(value, TimeSpan.Zero);

s_cachedMaxTimeout = true;
s_maximumTimeout = value;
LazyInitializer.EnsureInitialized(ref s_defaultTimeoutTicks, ref s_defaultTimeoutValidated, ref s_classSyncObject, () => DefaultSettingsSection.Timeout.Ticks);
bool timeoutAdjusted;
lock (ClassSyncObject)
{
Interlocked.Exchange(ref s_maximumTimeoutTicks, value.Ticks);

long defaultTimeoutTicks = Interlocked.Read(ref s_defaultTimeoutTicks);
Interlocked.Exchange(ref s_defaultTimeoutTicks, ValidateTimeout(new TimeSpan(defaultTimeoutTicks)).Ticks);
if (Interlocked.Read(ref s_defaultTimeoutTicks) != defaultTimeoutTicks)
TimeSpan timeout = new TimeSpan(s_defaultTimeoutTicks);
TimeSpan validatedTimeout = ValidateTimeout(timeout);
Interlocked.Exchange(ref s_defaultTimeoutTicks, validatedTimeout.Ticks);
timeoutAdjusted = validatedTimeout != timeout;
}
if (timeoutAdjusted)
{
if (etwLog.IsEnabled())
{
Expand Down Expand Up @@ -615,6 +594,6 @@ internal static Transaction FindOrCreatePromotedTransaction(Guid transactionIden
internal static OletxTransactionManager DistributedTransactionManager =>
// If the distributed transaction manager is not configured, throw an exception
LazyInitializer.EnsureInitialized(ref distributedTransactionManager, ref s_classSyncObject,
() => new OletxTransactionManager(DefaultSettingsSection.DistributedTransactionManagerName));
() => new OletxTransactionManager(""));
}
}