Distributed transaction fixes#76310

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
roji merged 2 commits into from
Sep 30, 2022
Merged

Distributed transaction fixes #76310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
469f503
Distributed transaction fixes
roji Sep 28, 2022
e068128
Fix member naming
roji Sep 29, 2022
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
18 changes: 16 additions & 2 deletions ...ies/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcProxyShimFactory.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,8 @@ internal sealed class DtcProxyShimFactory
private readonly ConcurrentQueue<ITransactionTransmitter> _cachedTransmitters = new();
private readonly ConcurrentQueue<ITransactionReceiver> _cachedReceivers = new();

private static readonly int s_maxCachedInterfaces = Environment.ProcessorCount * 2;

private readonly EventWaitHandle _eventHandle;

private ITransactionDispenser _transactionDispenser = null!; // Late-initialized in ConnectToProxy
Expand DownExpand Up@@ -350,7 +352,13 @@ internal ITransactionTransmitter GetCachedTransmitter(ITransaction transaction)
}

internal void ReturnCachedTransmitter(ITransactionTransmitter transmitter)
=> _cachedTransmitters.Enqueue(transmitter);
{
if (_cachedTransmitters.Count < s_maxCachedInterfaces)
{
transmitter.Reset();
_cachedTransmitters.Enqueue(transmitter);
Comment thread
stephentoub marked this conversation as resolved.
}
}

internal ITransactionReceiver GetCachedReceiver()
{
Expand All@@ -366,5 +374,11 @@ internal ITransactionReceiver GetCachedReceiver()
}

internal void ReturnCachedReceiver(ITransactionReceiver receiver)
=> _cachedReceivers.Enqueue(receiver);
{
if (_cachedReceivers.Count < s_maxCachedInterfaces)
{
receiver.Reset();
_cachedReceivers.Enqueue(receiver);
}
Comment thread
stephentoub marked this conversation as resolved.
}
}
24 changes: 18 additions & 6 deletions src/libraries/System.Transactions.Local/src/System/Transactions/TransactionState.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1867,7 +1867,6 @@ Guid promoterType
return false;
}


internal override void CompleteBlockingClone(InternalTransaction tx)
{
// First try to complete one of the internal blocking clones
Expand DownExpand Up@@ -1900,17 +1899,23 @@ internal override void CompleteBlockingClone(InternalTransaction tx)
Monitor.Exit(tx);
try
{
dtx.Complete();
try
{
dtx.Complete();
}
finally
{
dtx.Dispose();
}
}
finally
{
dtx.Dispose();
Monitor.Enter(tx);
}
}
}
}


internal override void CompleteAbortingClone(InternalTransaction tx)
{
// If we have a phase1Volatile.VolatileDemux, we have a phase1 volatile enlistment
Expand All@@ -1937,11 +1942,18 @@ internal override void CompleteAbortingClone(InternalTransaction tx)
Monitor.Exit(tx);
try
{
dtx.Complete();
try
{
dtx.Complete();
}
finally
{
dtx.Dispose();
}
}
finally
{
dtx.Dispose();
Monitor.Enter(tx);
}
}
}
Expand Down
85 changes: 58 additions & 27 deletions src/libraries/System.Transactions.Local/tests/OleTxTests.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,17 @@ public void Volatile_and_durable_enlistments(int volatileCount)

[ConditionalFact(nameof(IsRemoteExecutorSupportedAndNotNano))]
public void Promotion()
=> PromotionCore();

// #76010
[ConditionalFact(nameof(IsRemoteExecutorSupportedAndNotNano))]
public void Promotion_twice()
{
PromotionCore();
PromotionCore();
}

private void PromotionCore()
{
Test(() =>
{
Expand DownExpand Up@@ -203,28 +214,30 @@ public void Promotion()
static void Remote1(string propagationTokenFilePath)
=> Test(() =>
{
using var tx = new CommittableTransaction();

var outcomeEvent = new AutoResetEvent(false);
var enlistment = new TestEnlistment(Phase1Vote.Prepared, EnlistmentOutcome.Committed, outcomeReceived: outcomeEvent);
tx.EnlistDurable(Guid.NewGuid(), enlistment, EnlistmentOptions.None);

// We now have an OleTx transaction. Save its propagation token to disk so that the main process can read it when promoting.
byte[] propagationToken = TransactionInterop.GetTransmitterPropagationToken(tx);
File.WriteAllBytes(propagationTokenFilePath, propagationToken);
using (var tx = new CommittableTransaction())
{
var enlistment = new TestEnlistment(Phase1Vote.Prepared, EnlistmentOutcome.Committed, outcomeReceived: outcomeEvent);
tx.EnlistDurable(Guid.NewGuid(), enlistment, EnlistmentOptions.None);

// Signal to the main process that the propagation token is ready to be read
using var waitHandle1 = new EventWaitHandle(initialState: false, EventResetMode.ManualReset, "System.Transactions.Tests.OleTxTests.Promotion1");
waitHandle1.Set();
// We now have an OleTx transaction. Save its propagation token to disk so that the main process can read it when promoting.
byte[] propagationToken = TransactionInterop.GetTransmitterPropagationToken(tx);
File.WriteAllBytes(propagationTokenFilePath, propagationToken);

// The main process will now import our transaction via the propagation token, and propagate it to a 2nd process.
// In the main process the transaction is delegated; we're the one who started it, and so we're the one who need to Commit.
// When Commit() is called in the main process, that will trigger a SinglePhaseCommit on the PSPE which represents us. In SQL Server this
// contacts the DB to actually commit the transaction with MSDTC. In this simulation we'll just use the wait handle again to trigger this.
using var waitHandle3 = new EventWaitHandle(initialState: false, EventResetMode.ManualReset, "System.Transactions.Tests.OleTxTests.Promotion3");
Assert.True(waitHandle3.WaitOne(Timeout));
// Signal to the main process that the propagation token is ready to be read
using var waitHandle1 = new EventWaitHandle(initialState: false, EventResetMode.ManualReset, "System.Transactions.Tests.OleTxTests.Promotion1");
waitHandle1.Set();

tx.Commit();
// The main process will now import our transaction via the propagation token, and propagate it to a 2nd process.
// In the main process the transaction is delegated; we're the one who started it, and so we're the one who need to Commit.
// When Commit() is called in the main process, that will trigger a SinglePhaseCommit on the PSPE which represents us. In SQL Server this
// contacts the DB to actually commit the transaction with MSDTC. In this simulation we'll just use the wait handle again to trigger this.
using var waitHandle3 = new EventWaitHandle(initialState: false, EventResetMode.ManualReset, "System.Transactions.Tests.OleTxTests.Promotion3");
Assert.True(waitHandle3.WaitOne(Timeout));

tx.Commit();
}

// Wait for the commit to occur on our enlistment, then exit successfully.
Assert.True(outcomeEvent.WaitOne(Timeout));
Expand All@@ -234,18 +247,20 @@ static void Remote1(string propagationTokenFilePath)
static void Remote2(string exportCookieFilePath)
=> Test(() =>
{
var outcomeEvent = new AutoResetEvent(false);

// Load the export cookie and enlist durably
byte[] exportCookie = File.ReadAllBytes(exportCookieFilePath);
using var tx = TransactionInterop.GetTransactionFromExportCookie(exportCookie);

// Now enlist durably. This triggers promotion of the first PSPE, reading the propagation token.
var outcomeEvent = new AutoResetEvent(false);
var enlistment = new TestEnlistment(Phase1Vote.Prepared, EnlistmentOutcome.Committed, outcomeReceived: outcomeEvent);
tx.EnlistDurable(Guid.NewGuid(), enlistment, EnlistmentOptions.None);
using (var tx = TransactionInterop.GetTransactionFromExportCookie(exportCookie))
{
// Now enlist durably. This triggers promotion of the first PSPE, reading the propagation token.
var enlistment = new TestEnlistment(Phase1Vote.Prepared, EnlistmentOutcome.Committed, outcomeReceived: outcomeEvent);
tx.EnlistDurable(Guid.NewGuid(), enlistment, EnlistmentOptions.None);

// Signal to the main process that we're enlisted and ready to commit
using var waitHandle = new EventWaitHandle(initialState: false, EventResetMode.ManualReset, "System.Transactions.Tests.OleTxTests.Promotion2");
waitHandle.Set();
// Signal to the main process that we're enlisted and ready to commit
using var waitHandle = new EventWaitHandle(initialState: false, EventResetMode.ManualReset, "System.Transactions.Tests.OleTxTests.Promotion2");
waitHandle.Set();
}

// Wait for the main process to commit the transaction
Assert.True(outcomeEvent.WaitOne(Timeout));
Expand DownExpand Up@@ -414,6 +429,22 @@ public void TransmitterPropagationToken()
Assert.Equal(tx.TransactionInformation.DistributedIdentifier, tx2.TransactionInformation.DistributedIdentifier);
});

// #76010
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))]
public void TransactionScope_with_DependentTransaction()
=> Test(() =>
{
using var committableTransaction = new CommittableTransaction();
var propagationToken = TransactionInterop.GetTransmitterPropagationToken(committableTransaction);

var dependentTransaction = TransactionInterop.GetTransactionFromTransmitterPropagationToken(propagationToken);

using (var scope = new TransactionScope(dependentTransaction))
{
scope.Complete();
}
});

[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))]
public void GetExportCookie()
=> Test(() =>
Expand DownExpand Up@@ -472,7 +503,7 @@ private static void Test(Action action)
// In CI, we sometimes get XACT_E_TMNOTAVAILABLE; when it happens, it's typically on the very first
// attempt to connect to MSDTC (flaky/slow on-demand startup of MSDTC), though not only.
// This catches that error and retries.
int nRetries = 5;
int nRetries = 60;

while (true)
{
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Distributed transaction fixes#76310

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

roji
merged 2 commits into

from

Sep 30, 2022
 Merged


Distributed transaction fixes
#76310
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
469f503

Distributed transaction fixes


roji Sep 28, 2022
e068128

Fix member naming


roji Sep 29, 2022

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


18 changes: 16 additions & 2 deletions
...ies/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcProxyShimFactory.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,8 @@ internal sealed class DtcProxyShimFactory
 private readonly ConcurrentQueue<ITransactionTransmitter> _cachedTransmitters = new();
 private readonly ConcurrentQueue<ITransactionReceiver> _cachedReceivers = new();

 private static readonly int s_maxCachedInterfaces = Environment.ProcessorCount * 2;

 private readonly EventWaitHandle _eventHandle;

 private ITransactionDispenser _transactionDispenser = null!; // Late-initialized in ConnectToProxy
Expand DownExpand Up@@ -350,7 +352,13 @@ internal ITransactionTransmitter GetCachedTransmitter(ITransaction transaction)
 }

 internal void ReturnCachedTransmitter(ITransactionTransmitter transmitter)
 => _cachedTransmitters.Enqueue(transmitter);
 {
 if (_cachedTransmitters.Count < s_maxCachedInterfaces)
 {
 transmitter.Reset();
 _cachedTransmitters.Enqueue(transmitter);
Comment thread
stephentoub marked this conversation as resolved.

 }
 }

 internal ITransactionReceiver GetCachedReceiver()
 {
Expand All@@ -366,5 +374,11 @@ internal ITransactionReceiver GetCachedReceiver()
 }

 internal void ReturnCachedReceiver(ITransactionReceiver receiver)
 => _cachedReceivers.Enqueue(receiver);
 {
 if (_cachedReceivers.Count < s_maxCachedInterfaces)
 {
 receiver.Reset();
 _cachedReceivers.Enqueue(receiver);
 }
Comment thread
stephentoub marked this conversation as resolved.

 }
}

24 changes: 18 additions & 6 deletions
src/libraries/System.Transactions.Local/src/System/Transactions/TransactionState.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1867,7 +1867,6 @@ Guid promoterType
 return false;
 }


 internal override void CompleteBlockingClone(InternalTransaction tx)
 {
 // First try to complete one of the internal blocking clones
Expand DownExpand Up@@ -1900,17 +1899,23 @@ internal override void CompleteBlockingClone(InternalTransaction tx)
 Monitor.Exit(tx);
 try
 {
 dtx.Complete();
 try
 {
 dtx.Complete();
 }
 finally
 {
 dtx.Dispose();
 }
 }
 finally
 {
dtx.Dispose();
Monitor.Enter(tx);
 }
 }
 }
 }


 internal override void CompleteAbortingClone(InternalTransaction tx)
 {
 // If we have a phase1Volatile.VolatileDemux, we have a phase1 volatile enlistment
Expand All@@ -1937,11 +1942,18 @@ internal override void CompleteAbortingClone(InternalTransaction tx)
 Monitor.Exit(tx);
 try
 {
 dtx.Complete();
 try
 {
 dtx.Complete();
 }
 finally
 {
 dtx.Dispose();
 }
 }
 finally
 {
dtx.Dispose();
Monitor.Enter(tx);
 }
 }
 }
Expand Down

85 changes: 58 additions & 27 deletions
src/libraries/System.Transactions.Local/tests/OleTxTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,17 @@ public void Volatile_and_durable_enlistments(int volatileCount)

 [ConditionalFact(nameof(IsRemoteExecutorSupportedAndNotNano))]
 public void Promotion()
 => PromotionCore();

 // #76010
 [ConditionalFact(nameof(IsRemoteExecutorSupportedAndNotNano))]
 public void Promotion_twice()
 {
 PromotionCore();
 PromotionCore();
 }

 private void PromotionCore()
 {
 Test(() =>
 {
Expand DownExpand Up@@ -203,28 +214,30 @@ public void Promotion()
 static void Remote1(string propagationTokenFilePath)
 => Test(() =>
 {
 using var tx = new CommittableTransaction();

 var outcomeEvent = new AutoResetEvent(false);
 var enlistment = new TestEnlistment(Phase1Vote.Prepared, EnlistmentOutcome.Committed, outcomeReceived: outcomeEvent);
 tx.EnlistDurable(Guid.NewGuid(), enlistment, EnlistmentOptions.None);

 // We now have an OleTx transaction. Save its propagation token to disk so that the main process can read it when promoting.
 byte[] propagationToken = TransactionInterop.GetTransmitterPropagationToken(tx);
 File.WriteAllBytes(propagationTokenFilePath, propagationToken);
 using (var tx = new CommittableTransaction())
 {
 var enlistment = new TestEnlistment(Phase1Vote.Prepared, EnlistmentOutcome.Committed, outcomeReceived: outcomeEvent);
 tx.EnlistDurable(Guid.NewGuid(), enlistment, EnlistmentOptions.None);

 // Signal to the main process that the propagation token is ready to be read
using var waitHandle1 = new EventWaitHandle(initialState: false, EventResetMode.ManualReset, "System.Transactions.Tests.OleTxTests.Promotion1");
waitHandle1.Set();
// We now have an OleTx transaction. Save its propagation token to disk so that the main process can read it when promoting.
 byte[] propagationToken = TransactionInterop.GetTransmitterPropagationToken(tx);
 File.WriteAllBytes(propagationTokenFilePath, propagationToken);

 // The main process will now import our transaction via the propagation token, and propagate it to a 2nd process.
 // In the main process the transaction is delegated; we're the one who started it, and so we're the one who need to Commit.
 // When Commit() is called in the main process, that will trigger a SinglePhaseCommit on the PSPE which represents us. In SQL Server this
 // contacts the DB to actually commit the transaction with MSDTC. In this simulation we'll just use the wait handle again to trigger this.
 using var waitHandle3 = new EventWaitHandle(initialState: false, EventResetMode.ManualReset, "System.Transactions.Tests.OleTxTests.Promotion3");
 Assert.True(waitHandle3.WaitOne(Timeout));
 // Signal to the main process that the propagation token is ready to be read
 using var waitHandle1 = new EventWaitHandle(initialState: false, EventResetMode.ManualReset, "System.Transactions.Tests.OleTxTests.Promotion1");
 waitHandle1.Set();

 tx.Commit();
 // The main process will now import our transaction via the propagation token, and propagate it to a 2nd process.
 // In the main process the transaction is delegated; we're the one who started it, and so we're the one who need to Commit.
 // When Commit() is called in the main process, that will trigger a SinglePhaseCommit on the PSPE which represents us. In SQL Server this
 // contacts the DB to actually commit the transaction with MSDTC. In this simulation we'll just use the wait handle again to trigger this.
 using var waitHandle3 = new EventWaitHandle(initialState: false, EventResetMode.ManualReset, "System.Transactions.Tests.OleTxTests.Promotion3");
 Assert.True(waitHandle3.WaitOne(Timeout));

 tx.Commit();
 }

 // Wait for the commit to occur on our enlistment, then exit successfully.
 Assert.True(outcomeEvent.WaitOne(Timeout));
Expand All@@ -234,18 +247,20 @@ static void Remote1(string propagationTokenFilePath)
 static void Remote2(string exportCookieFilePath)
 => Test(() =>
 {
 var outcomeEvent = new AutoResetEvent(false);

 // Load the export cookie and enlist durably
 byte[] exportCookie = File.ReadAllBytes(exportCookieFilePath);
 using var tx = TransactionInterop.GetTransactionFromExportCookie(exportCookie);

 // Now enlist durably. This triggers promotion of the first PSPE, reading the propagation token.
 var outcomeEvent = new AutoResetEvent(false);
 var enlistment = new TestEnlistment(Phase1Vote.Prepared, EnlistmentOutcome.Committed, outcomeReceived: outcomeEvent);
 tx.EnlistDurable(Guid.NewGuid(), enlistment, EnlistmentOptions.None);
 using (var tx = TransactionInterop.GetTransactionFromExportCookie(exportCookie))
 {
 // Now enlist durably. This triggers promotion of the first PSPE, reading the propagation token.
 var enlistment = new TestEnlistment(Phase1Vote.Prepared, EnlistmentOutcome.Committed, outcomeReceived: outcomeEvent);
 tx.EnlistDurable(Guid.NewGuid(), enlistment, EnlistmentOptions.None);

 // Signal to the main process that we're enlisted and ready to commit
 using var waitHandle = new EventWaitHandle(initialState: false, EventResetMode.ManualReset, "System.Transactions.Tests.OleTxTests.Promotion2");
 waitHandle.Set();
 // Signal to the main process that we're enlisted and ready to commit
 using var waitHandle = new EventWaitHandle(initialState: false, EventResetMode.ManualReset, "System.Transactions.Tests.OleTxTests.Promotion2");
 waitHandle.Set();
 }

 // Wait for the main process to commit the transaction
 Assert.True(outcomeEvent.WaitOne(Timeout));
Expand DownExpand Up@@ -414,6 +429,22 @@ public void TransmitterPropagationToken()
 Assert.Equal(tx.TransactionInformation.DistributedIdentifier, tx2.TransactionInformation.DistributedIdentifier);
 });

 // #76010
 [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))]
 public void TransactionScope_with_DependentTransaction()
 => Test(() =>
 {
 using var committableTransaction = new CommittableTransaction();
 var propagationToken = TransactionInterop.GetTransmitterPropagationToken(committableTransaction);

 var dependentTransaction = TransactionInterop.GetTransactionFromTransmitterPropagationToken(propagationToken);

 using (var scope = new TransactionScope(dependentTransaction))
 {
 scope.Complete();
 }
 });

 [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))]
 public void GetExportCookie()
 => Test(() =>
Expand DownExpand Up@@ -472,7 +503,7 @@ private static void Test(Action action)
 // In CI, we sometimes get XACT_E_TMNOTAVAILABLE; when it happens, it's typically on the very first
 // attempt to connect to MSDTC (flaky/slow on-demand startup of MSDTC), though not only.
 // This catches that error and retries.
 int nRetries = 5;
 int nRetries = 60;

 while (true)
 {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Distributed transaction fixes#76310

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

roji
merged 2 commits into

from

Sep 30, 2022
 Merged


Distributed transaction fixes
#76310
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
469f503

Distributed transaction fixes


roji Sep 28, 2022
e068128

Fix member naming


roji Sep 29, 2022

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


18 changes: 16 additions & 2 deletions
...ies/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcProxyShimFactory.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,8 @@ internal sealed class DtcProxyShimFactory
 private readonly ConcurrentQueue<ITransactionTransmitter> _cachedTransmitters = new();
 private readonly ConcurrentQueue<ITransactionReceiver> _cachedReceivers = new();

 private static readonly int s_maxCachedInterfaces = Environment.ProcessorCount * 2;

 private readonly EventWaitHandle _eventHandle;

 private ITransactionDispenser _transactionDispenser = null!; // Late-initialized in ConnectToProxy
Expand DownExpand Up@@ -350,7 +352,13 @@ internal ITransactionTransmitter GetCachedTransmitter(ITransaction transaction)
 }

 internal void ReturnCachedTransmitter(ITransactionTransmitter transmitter)
 => _cachedTransmitters.Enqueue(transmitter);
 {
 if (_cachedTransmitters.Count < s_maxCachedInterfaces)
 {
 transmitter.Reset();
 _cachedTransmitters.Enqueue(transmitter);
Comment thread
stephentoub marked this conversation as resolved.

 }
 }

 internal ITransactionReceiver GetCachedReceiver()
 {
Expand All@@ -366,5 +374,11 @@ internal ITransactionReceiver GetCachedReceiver()
 }

 internal void ReturnCachedReceiver(ITransactionReceiver receiver)
 => _cachedReceivers.Enqueue(receiver);
 {
 if (_cachedReceivers.Count < s_maxCachedInterfaces)
 {
 receiver.Reset();
 _cachedReceivers.Enqueue(receiver);
 }
Comment thread
stephentoub marked this conversation as resolved.

 }
}

24 changes: 18 additions & 6 deletions
src/libraries/System.Transactions.Local/src/System/Transactions/TransactionState.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1867,7 +1867,6 @@ Guid promoterType
 return false;
 }


 internal override void CompleteBlockingClone(InternalTransaction tx)
 {
 // First try to complete one of the internal blocking clones
Expand DownExpand Up@@ -1900,17 +1899,23 @@ internal override void CompleteBlockingClone(InternalTransaction tx)
 Monitor.Exit(tx);
 try
 {
 dtx.Complete();
 try
 {
 dtx.Complete();
 }
 finally
 {
 dtx.Dispose();
 }
 }
 finally
 {
dtx.Dispose();
Monitor.Enter(tx);
 }
 }
 }
 }


 internal override void CompleteAbortingClone(InternalTransaction tx)
 {
 // If we have a phase1Volatile.VolatileDemux, we have a phase1 volatile enlistment
Expand All@@ -1937,11 +1942,18 @@ internal override void CompleteAbortingClone(InternalTransaction tx)
 Monitor.Exit(tx);
 try
 {
 dtx.Complete();
 try
 {
 dtx.Complete();
 }
 finally
 {
 dtx.Dispose();
 }
 }
 finally
 {
dtx.Dispose();
Monitor.Enter(tx);
 }
 }
 }
Expand Down

85 changes: 58 additions & 27 deletions
src/libraries/System.Transactions.Local/tests/OleTxTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,17 @@ public void Volatile_and_durable_enlistments(int volatileCount)

 [ConditionalFact(nameof(IsRemoteExecutorSupportedAndNotNano))]
 public void Promotion()
 => PromotionCore();

 // #76010
 [ConditionalFact(nameof(IsRemoteExecutorSupportedAndNotNano))]
 public void Promotion_twice()
 {
 PromotionCore();
 PromotionCore();
 }

 private void PromotionCore()
 {
 Test(() =>
 {
Expand DownExpand Up@@ -203,28 +214,30 @@ public void Promotion()
 static void Remote1(string propagationTokenFilePath)
 => Test(() =>
 {
 using var tx = new CommittableTransaction();

 var outcomeEvent = new AutoResetEvent(false);
 var enlistment = new TestEnlistment(Phase1Vote.Prepared, EnlistmentOutcome.Committed, outcomeReceived: outcomeEvent);
 tx.EnlistDurable(Guid.NewGuid(), enlistment, EnlistmentOptions.None);

 // We now have an OleTx transaction. Save its propagation token to disk so that the main process can read it when promoting.
 byte[] propagationToken = TransactionInterop.GetTransmitterPropagationToken(tx);
 File.WriteAllBytes(propagationTokenFilePath, propagationToken);
 using (var tx = new CommittableTransaction())
 {
 var enlistment = new TestEnlistment(Phase1Vote.Prepared, EnlistmentOutcome.Committed, outcomeReceived: outcomeEvent);
 tx.EnlistDurable(Guid.NewGuid(), enlistment, EnlistmentOptions.None);

 // Signal to the main process that the propagation token is ready to be read
using var waitHandle1 = new EventWaitHandle(initialState: false, EventResetMode.ManualReset, "System.Transactions.Tests.OleTxTests.Promotion1");
waitHandle1.Set();
// We now have an OleTx transaction. Save its propagation token to disk so that the main process can read it when promoting.
 byte[] propagationToken = TransactionInterop.GetTransmitterPropagationToken(tx);
 File.WriteAllBytes(propagationTokenFilePath, propagationToken);

 // The main process will now import our transaction via the propagation token, and propagate it to a 2nd process.
 // In the main process the transaction is delegated; we're the one who started it, and so we're the one who need to Commit.
 // When Commit() is called in the main process, that will trigger a SinglePhaseCommit on the PSPE which represents us. In SQL Server this
 // contacts the DB to actually commit the transaction with MSDTC. In this simulation we'll just use the wait handle again to trigger this.
 using var waitHandle3 = new EventWaitHandle(initialState: false, EventResetMode.ManualReset, "System.Transactions.Tests.OleTxTests.Promotion3");
 Assert.True(waitHandle3.WaitOne(Timeout));
 // Signal to the main process that the propagation token is ready to be read
 using var waitHandle1 = new EventWaitHandle(initialState: false, EventResetMode.ManualReset, "System.Transactions.Tests.OleTxTests.Promotion1");
 waitHandle1.Set();

 tx.Commit();
 // The main process will now import our transaction via the propagation token, and propagate it to a 2nd process.
 // In the main process the transaction is delegated; we're the one who started it, and so we're the one who need to Commit.
 // When Commit() is called in the main process, that will trigger a SinglePhaseCommit on the PSPE which represents us. In SQL Server this
 // contacts the DB to actually commit the transaction with MSDTC. In this simulation we'll just use the wait handle again to trigger this.
 using var waitHandle3 = new EventWaitHandle(initialState: false, EventResetMode.ManualReset, "System.Transactions.Tests.OleTxTests.Promotion3");
 Assert.True(waitHandle3.WaitOne(Timeout));

 tx.Commit();
 }

 // Wait for the commit to occur on our enlistment, then exit successfully.
 Assert.True(outcomeEvent.WaitOne(Timeout));
Expand All@@ -234,18 +247,20 @@ static void Remote1(string propagationTokenFilePath)
 static void Remote2(string exportCookieFilePath)
 => Test(() =>
 {
 var outcomeEvent = new AutoResetEvent(false);

 // Load the export cookie and enlist durably
 byte[] exportCookie = File.ReadAllBytes(exportCookieFilePath);
 using var tx = TransactionInterop.GetTransactionFromExportCookie(exportCookie);

 // Now enlist durably. This triggers promotion of the first PSPE, reading the propagation token.
 var outcomeEvent = new AutoResetEvent(false);
 var enlistment = new TestEnlistment(Phase1Vote.Prepared, EnlistmentOutcome.Committed, outcomeReceived: outcomeEvent);
 tx.EnlistDurable(Guid.NewGuid(), enlistment, EnlistmentOptions.None);
 using (var tx = TransactionInterop.GetTransactionFromExportCookie(exportCookie))
 {
 // Now enlist durably. This triggers promotion of the first PSPE, reading the propagation token.
 var enlistment = new TestEnlistment(Phase1Vote.Prepared, EnlistmentOutcome.Committed, outcomeReceived: outcomeEvent);
 tx.EnlistDurable(Guid.NewGuid(), enlistment, EnlistmentOptions.None);

 // Signal to the main process that we're enlisted and ready to commit
 using var waitHandle = new EventWaitHandle(initialState: false, EventResetMode.ManualReset, "System.Transactions.Tests.OleTxTests.Promotion2");
 waitHandle.Set();
 // Signal to the main process that we're enlisted and ready to commit
 using var waitHandle = new EventWaitHandle(initialState: false, EventResetMode.ManualReset, "System.Transactions.Tests.OleTxTests.Promotion2");
 waitHandle.Set();
 }

 // Wait for the main process to commit the transaction
 Assert.True(outcomeEvent.WaitOne(Timeout));
Expand DownExpand Up@@ -414,6 +429,22 @@ public void TransmitterPropagationToken()
 Assert.Equal(tx.TransactionInformation.DistributedIdentifier, tx2.TransactionInformation.DistributedIdentifier);
 });

 // #76010
 [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))]
 public void TransactionScope_with_DependentTransaction()
 => Test(() =>
 {
 using var committableTransaction = new CommittableTransaction();
 var propagationToken = TransactionInterop.GetTransmitterPropagationToken(committableTransaction);

 var dependentTransaction = TransactionInterop.GetTransactionFromTransmitterPropagationToken(propagationToken);

 using (var scope = new TransactionScope(dependentTransaction))
 {
 scope.Complete();
 }
 });

 [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))]
 public void GetExportCookie()
 => Test(() =>
Expand DownExpand Up@@ -472,7 +503,7 @@ private static void Test(Action action)
 // In CI, we sometimes get XACT_E_TMNOTAVAILABLE; when it happens, it's typically on the very first
 // attempt to connect to MSDTC (flaky/slow on-demand startup of MSDTC), though not only.
 // This catches that error and retries.
 int nRetries = 5;
 int nRetries = 60;

 while (true)
 {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Distributed transaction fixes#76310

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

roji
merged 2 commits into

from

Sep 30, 2022
 Merged


Distributed transaction fixes
#76310
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
469f503

Distributed transaction fixes


roji Sep 28, 2022
e068128

Fix member naming


roji Sep 29, 2022

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


18 changes: 16 additions & 2 deletions
...ies/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcProxyShimFactory.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,8 @@ internal sealed class DtcProxyShimFactory
 private readonly ConcurrentQueue<ITransactionTransmitter> _cachedTransmitters = new();
 private readonly ConcurrentQueue<ITransactionReceiver> _cachedReceivers = new();

 private static readonly int s_maxCachedInterfaces = Environment.ProcessorCount * 2;

 private readonly EventWaitHandle _eventHandle;

 private ITransactionDispenser _transactionDispenser = null!; // Late-initialized in ConnectToProxy
Expand DownExpand Up@@ -350,7 +352,13 @@ internal ITransactionTransmitter GetCachedTransmitter(ITransaction transaction)
 }

 internal void ReturnCachedTransmitter(ITransactionTransmitter transmitter)
 => _cachedTransmitters.Enqueue(transmitter);
 {
 if (_cachedTransmitters.Count < s_maxCachedInterfaces)
 {
 transmitter.Reset();
 _cachedTransmitters.Enqueue(transmitter);
Comment thread
stephentoub marked this conversation as resolved.

 }
 }

 internal ITransactionReceiver GetCachedReceiver()
 {
Expand All@@ -366,5 +374,11 @@ internal ITransactionReceiver GetCachedReceiver()
 }

 internal void ReturnCachedReceiver(ITransactionReceiver receiver)
 => _cachedReceivers.Enqueue(receiver);
 {
 if (_cachedReceivers.Count < s_maxCachedInterfaces)
 {
 receiver.Reset();
 _cachedReceivers.Enqueue(receiver);
 }
Comment thread
stephentoub marked this conversation as resolved.

 }
}

24 changes: 18 additions & 6 deletions
src/libraries/System.Transactions.Local/src/System/Transactions/TransactionState.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1867,7 +1867,6 @@ Guid promoterType
 return false;
 }


 internal override void CompleteBlockingClone(InternalTransaction tx)
 {
 // First try to complete one of the internal blocking clones
Expand DownExpand Up@@ -1900,17 +1899,23 @@ internal override void CompleteBlockingClone(InternalTransaction tx)
 Monitor.Exit(tx);
 try
 {
 dtx.Complete();
 try
 {
 dtx.Complete();
 }
 finally
 {
 dtx.Dispose();
 }
 }
 finally
 {
dtx.Dispose();
Monitor.Enter(tx);
 }
 }
 }
 }


 internal override void CompleteAbortingClone(InternalTransaction tx)
 {
 // If we have a phase1Volatile.VolatileDemux, we have a phase1 volatile enlistment
Expand All@@ -1937,11 +1942,18 @@ internal override void CompleteAbortingClone(InternalTransaction tx)
 Monitor.Exit(tx);
 try
 {
 dtx.Complete();
 try
 {
 dtx.Complete();
 }
 finally
 {
 dtx.Dispose();
 }
 }
 finally
 {
dtx.Dispose();
Monitor.Enter(tx);
 }
 }
 }
Expand Down

85 changes: 58 additions & 27 deletions
src/libraries/System.Transactions.Local/tests/OleTxTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,17 @@ public void Volatile_and_durable_enlistments(int volatileCount)

 [ConditionalFact(nameof(IsRemoteExecutorSupportedAndNotNano))]
 public void Promotion()
 => PromotionCore();

 // #76010
 [ConditionalFact(nameof(IsRemoteExecutorSupportedAndNotNano))]
 public void Promotion_twice()
 {
 PromotionCore();
 PromotionCore();
 }

 private void PromotionCore()
 {
 Test(() =>
 {
Expand DownExpand Up@@ -203,28 +214,30 @@ public void Promotion()
 static void Remote1(string propagationTokenFilePath)
 => Test(() =>
 {
 using var tx = new CommittableTransaction();

 var outcomeEvent = new AutoResetEvent(false);
 var enlistment = new TestEnlistment(Phase1Vote.Prepared, EnlistmentOutcome.Committed, outcomeReceived: outcomeEvent);
 tx.EnlistDurable(Guid.NewGuid(), enlistment, EnlistmentOptions.None);

 // We now have an OleTx transaction. Save its propagation token to disk so that the main process can read it when promoting.
 byte[] propagationToken = TransactionInterop.GetTransmitterPropagationToken(tx);
 File.WriteAllBytes(propagationTokenFilePath, propagationToken);
 using (var tx = new CommittableTransaction())
 {
 var enlistment = new TestEnlistment(Phase1Vote.Prepared, EnlistmentOutcome.Committed, outcomeReceived: outcomeEvent);
 tx.EnlistDurable(Guid.NewGuid(), enlistment, EnlistmentOptions.None);

 // Signal to the main process that the propagation token is ready to be read
using var waitHandle1 = new EventWaitHandle(initialState: false, EventResetMode.ManualReset, "System.Transactions.Tests.OleTxTests.Promotion1");
waitHandle1.Set();
// We now have an OleTx transaction. Save its propagation token to disk so that the main process can read it when promoting.
 byte[] propagationToken = TransactionInterop.GetTransmitterPropagationToken(tx);
 File.WriteAllBytes(propagationTokenFilePath, propagationToken);

 // The main process will now import our transaction via the propagation token, and propagate it to a 2nd process.
 // In the main process the transaction is delegated; we're the one who started it, and so we're the one who need to Commit.
 // When Commit() is called in the main process, that will trigger a SinglePhaseCommit on the PSPE which represents us. In SQL Server this
 // contacts the DB to actually commit the transaction with MSDTC. In this simulation we'll just use the wait handle again to trigger this.
 using var waitHandle3 = new EventWaitHandle(initialState: false, EventResetMode.ManualReset, "System.Transactions.Tests.OleTxTests.Promotion3");
 Assert.True(waitHandle3.WaitOne(Timeout));
 // Signal to the main process that the propagation token is ready to be read
 using var waitHandle1 = new EventWaitHandle(initialState: false, EventResetMode.ManualReset, "System.Transactions.Tests.OleTxTests.Promotion1");
 waitHandle1.Set();

 tx.Commit();
 // The main process will now import our transaction via the propagation token, and propagate it to a 2nd process.
 // In the main process the transaction is delegated; we're the one who started it, and so we're the one who need to Commit.
 // When Commit() is called in the main process, that will trigger a SinglePhaseCommit on the PSPE which represents us. In SQL Server this
 // contacts the DB to actually commit the transaction with MSDTC. In this simulation we'll just use the wait handle again to trigger this.
 using var waitHandle3 = new EventWaitHandle(initialState: false, EventResetMode.ManualReset, "System.Transactions.Tests.OleTxTests.Promotion3");
 Assert.True(waitHandle3.WaitOne(Timeout));

 tx.Commit();
 }

 // Wait for the commit to occur on our enlistment, then exit successfully.
 Assert.True(outcomeEvent.WaitOne(Timeout));
Expand All@@ -234,18 +247,20 @@ static void Remote1(string propagationTokenFilePath)
 static void Remote2(string exportCookieFilePath)
 => Test(() =>
 {
 var outcomeEvent = new AutoResetEvent(false);

 // Load the export cookie and enlist durably
 byte[] exportCookie = File.ReadAllBytes(exportCookieFilePath);
 using var tx = TransactionInterop.GetTransactionFromExportCookie(exportCookie);

 // Now enlist durably. This triggers promotion of the first PSPE, reading the propagation token.
 var outcomeEvent = new AutoResetEvent(false);
 var enlistment = new TestEnlistment(Phase1Vote.Prepared, EnlistmentOutcome.Committed, outcomeReceived: outcomeEvent);
 tx.EnlistDurable(Guid.NewGuid(), enlistment, EnlistmentOptions.None);
 using (var tx = TransactionInterop.GetTransactionFromExportCookie(exportCookie))
 {
 // Now enlist durably. This triggers promotion of the first PSPE, reading the propagation token.
 var enlistment = new TestEnlistment(Phase1Vote.Prepared, EnlistmentOutcome.Committed, outcomeReceived: outcomeEvent);
 tx.EnlistDurable(Guid.NewGuid(), enlistment, EnlistmentOptions.None);

 // Signal to the main process that we're enlisted and ready to commit
 using var waitHandle = new EventWaitHandle(initialState: false, EventResetMode.ManualReset, "System.Transactions.Tests.OleTxTests.Promotion2");
 waitHandle.Set();
 // Signal to the main process that we're enlisted and ready to commit
 using var waitHandle = new EventWaitHandle(initialState: false, EventResetMode.ManualReset, "System.Transactions.Tests.OleTxTests.Promotion2");
 waitHandle.Set();
 }

 // Wait for the main process to commit the transaction
 Assert.True(outcomeEvent.WaitOne(Timeout));
Expand DownExpand Up@@ -414,6 +429,22 @@ public void TransmitterPropagationToken()
 Assert.Equal(tx.TransactionInformation.DistributedIdentifier, tx2.TransactionInformation.DistributedIdentifier);
 });

 // #76010
 [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))]
 public void TransactionScope_with_DependentTransaction()
 => Test(() =>
 {
 using var committableTransaction = new CommittableTransaction();
 var propagationToken = TransactionInterop.GetTransmitterPropagationToken(committableTransaction);

 var dependentTransaction = TransactionInterop.GetTransactionFromTransmitterPropagationToken(propagationToken);

 using (var scope = new TransactionScope(dependentTransaction))
 {
 scope.Complete();
 }
 });

 [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))]
 public void GetExportCookie()
 => Test(() =>
Expand DownExpand Up@@ -472,7 +503,7 @@ private static void Test(Action action)
 // In CI, we sometimes get XACT_E_TMNOTAVAILABLE; when it happens, it's typically on the very first
 // attempt to connect to MSDTC (flaky/slow on-demand startup of MSDTC), though not only.
 // This catches that error and retries.
 int nRetries = 5;
 int nRetries = 60;

 while (true)
 {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Distributed transaction fixes#76310

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

roji
merged 2 commits into

from

Sep 30, 2022
 Merged


Distributed transaction fixes
#76310
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
469f503

Distributed transaction fixes


roji Sep 28, 2022
e068128

Fix member naming


roji Sep 29, 2022

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


18 changes: 16 additions & 2 deletions
...ies/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcProxyShimFactory.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,8 @@ internal sealed class DtcProxyShimFactory
 private readonly ConcurrentQueue<ITransactionTransmitter> _cachedTransmitters = new();
 private readonly ConcurrentQueue<ITransactionReceiver> _cachedReceivers = new();

 private static readonly int s_maxCachedInterfaces = Environment.ProcessorCount * 2;

 private readonly EventWaitHandle _eventHandle;

 private ITransactionDispenser _transactionDispenser = null!; // Late-initialized in ConnectToProxy
Expand DownExpand Up@@ -350,7 +352,13 @@ internal ITransactionTransmitter GetCachedTransmitter(ITransaction transaction)
 }

 internal void ReturnCachedTransmitter(ITransactionTransmitter transmitter)
 => _cachedTransmitters.Enqueue(transmitter);
 {
 if (_cachedTransmitters.Count < s_maxCachedInterfaces)
 {
 transmitter.Reset();
 _cachedTransmitters.Enqueue(transmitter);
Comment thread
stephentoub marked this conversation as resolved.

 }
 }

 internal ITransactionReceiver GetCachedReceiver()
 {
Expand All@@ -366,5 +374,11 @@ internal ITransactionReceiver GetCachedReceiver()
 }

 internal void ReturnCachedReceiver(ITransactionReceiver receiver)
 => _cachedReceivers.Enqueue(receiver);
 {
 if (_cachedReceivers.Count < s_maxCachedInterfaces)
 {
 receiver.Reset();
 _cachedReceivers.Enqueue(receiver);
 }
Comment thread
stephentoub marked this conversation as resolved.

 }
}

24 changes: 18 additions & 6 deletions
src/libraries/System.Transactions.Local/src/System/Transactions/TransactionState.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1867,7 +1867,6 @@ Guid promoterType
 return false;
 }


 internal override void CompleteBlockingClone(InternalTransaction tx)
 {
 // First try to complete one of the internal blocking clones
Expand DownExpand Up@@ -1900,17 +1899,23 @@ internal override void CompleteBlockingClone(InternalTransaction tx)
 Monitor.Exit(tx);
 try
 {
 dtx.Complete();
 try
 {
 dtx.Complete();
 }
 finally
 {
 dtx.Dispose();
 }
 }
 finally
 {
dtx.Dispose();
Monitor.Enter(tx);
 }
 }
 }
 }


 internal override void CompleteAbortingClone(InternalTransaction tx)
 {
 // If we have a phase1Volatile.VolatileDemux, we have a phase1 volatile enlistment
Expand All@@ -1937,11 +1942,18 @@ internal override void CompleteAbortingClone(InternalTransaction tx)
 Monitor.Exit(tx);
 try
 {
 dtx.Complete();
 try
 {
 dtx.Complete();
 }
 finally
 {
 dtx.Dispose();
 }
 }
 finally
 {
dtx.Dispose();
Monitor.Enter(tx);
 }
 }
 }
Expand Down

85 changes: 58 additions & 27 deletions
src/libraries/System.Transactions.Local/tests/OleTxTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,17 @@ public void Volatile_and_durable_enlistments(int volatileCount)

 [ConditionalFact(nameof(IsRemoteExecutorSupportedAndNotNano))]
 public void Promotion()
 => PromotionCore();

 // #76010
 [ConditionalFact(nameof(IsRemoteExecutorSupportedAndNotNano))]
 public void Promotion_twice()
 {
 PromotionCore();
 PromotionCore();
 }

 private void PromotionCore()
 {
 Test(() =>
 {
Expand DownExpand Up@@ -203,28 +214,30 @@ public void Promotion()
 static void Remote1(string propagationTokenFilePath)
 => Test(() =>
 {
 using var tx = new CommittableTransaction();

 var outcomeEvent = new AutoResetEvent(false);
 var enlistment = new TestEnlistment(Phase1Vote.Prepared, EnlistmentOutcome.Committed, outcomeReceived: outcomeEvent);
 tx.EnlistDurable(Guid.NewGuid(), enlistment, EnlistmentOptions.None);

 // We now have an OleTx transaction. Save its propagation token to disk so that the main process can read it when promoting.
 byte[] propagationToken = TransactionInterop.GetTransmitterPropagationToken(tx);
 File.WriteAllBytes(propagationTokenFilePath, propagationToken);
 using (var tx = new CommittableTransaction())
 {
 var enlistment = new TestEnlistment(Phase1Vote.Prepared, EnlistmentOutcome.Committed, outcomeReceived: outcomeEvent);
 tx.EnlistDurable(Guid.NewGuid(), enlistment, EnlistmentOptions.None);

 // Signal to the main process that the propagation token is ready to be read
using var waitHandle1 = new EventWaitHandle(initialState: false, EventResetMode.ManualReset, "System.Transactions.Tests.OleTxTests.Promotion1");
waitHandle1.Set();
// We now have an OleTx transaction. Save its propagation token to disk so that the main process can read it when promoting.
 byte[] propagationToken = TransactionInterop.GetTransmitterPropagationToken(tx);
 File.WriteAllBytes(propagationTokenFilePath, propagationToken);

 // The main process will now import our transaction via the propagation token, and propagate it to a 2nd process.
 // In the main process the transaction is delegated; we're the one who started it, and so we're the one who need to Commit.
 // When Commit() is called in the main process, that will trigger a SinglePhaseCommit on the PSPE which represents us. In SQL Server this
 // contacts the DB to actually commit the transaction with MSDTC. In this simulation we'll just use the wait handle again to trigger this.
 using var waitHandle3 = new EventWaitHandle(initialState: false, EventResetMode.ManualReset, "System.Transactions.Tests.OleTxTests.Promotion3");
 Assert.True(waitHandle3.WaitOne(Timeout));
 // Signal to the main process that the propagation token is ready to be read
 using var waitHandle1 = new EventWaitHandle(initialState: false, EventResetMode.ManualReset, "System.Transactions.Tests.OleTxTests.Promotion1");
 waitHandle1.Set();

 tx.Commit();
 // The main process will now import our transaction via the propagation token, and propagate it to a 2nd process.
 // In the main process the transaction is delegated; we're the one who started it, and so we're the one who need to Commit.
 // When Commit() is called in the main process, that will trigger a SinglePhaseCommit on the PSPE which represents us. In SQL Server this
 // contacts the DB to actually commit the transaction with MSDTC. In this simulation we'll just use the wait handle again to trigger this.
 using var waitHandle3 = new EventWaitHandle(initialState: false, EventResetMode.ManualReset, "System.Transactions.Tests.OleTxTests.Promotion3");
 Assert.True(waitHandle3.WaitOne(Timeout));

 tx.Commit();
 }

 // Wait for the commit to occur on our enlistment, then exit successfully.
 Assert.True(outcomeEvent.WaitOne(Timeout));
Expand All@@ -234,18 +247,20 @@ static void Remote1(string propagationTokenFilePath)
 static void Remote2(string exportCookieFilePath)
 => Test(() =>
 {
 var outcomeEvent = new AutoResetEvent(false);

 // Load the export cookie and enlist durably
 byte[] exportCookie = File.ReadAllBytes(exportCookieFilePath);
 using var tx = TransactionInterop.GetTransactionFromExportCookie(exportCookie);

 // Now enlist durably. This triggers promotion of the first PSPE, reading the propagation token.
 var outcomeEvent = new AutoResetEvent(false);
 var enlistment = new TestEnlistment(Phase1Vote.Prepared, EnlistmentOutcome.Committed, outcomeReceived: outcomeEvent);
 tx.EnlistDurable(Guid.NewGuid(), enlistment, EnlistmentOptions.None);
 using (var tx = TransactionInterop.GetTransactionFromExportCookie(exportCookie))
 {
 // Now enlist durably. This triggers promotion of the first PSPE, reading the propagation token.
 var enlistment = new TestEnlistment(Phase1Vote.Prepared, EnlistmentOutcome.Committed, outcomeReceived: outcomeEvent);
 tx.EnlistDurable(Guid.NewGuid(), enlistment, EnlistmentOptions.None);

 // Signal to the main process that we're enlisted and ready to commit
 using var waitHandle = new EventWaitHandle(initialState: false, EventResetMode.ManualReset, "System.Transactions.Tests.OleTxTests.Promotion2");
 waitHandle.Set();
 // Signal to the main process that we're enlisted and ready to commit
 using var waitHandle = new EventWaitHandle(initialState: false, EventResetMode.ManualReset, "System.Transactions.Tests.OleTxTests.Promotion2");
 waitHandle.Set();
 }

 // Wait for the main process to commit the transaction
 Assert.True(outcomeEvent.WaitOne(Timeout));
Expand DownExpand Up@@ -414,6 +429,22 @@ public void TransmitterPropagationToken()
 Assert.Equal(tx.TransactionInformation.DistributedIdentifier, tx2.TransactionInformation.DistributedIdentifier);
 });

 // #76010
 [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))]
 public void TransactionScope_with_DependentTransaction()
 => Test(() =>
 {
 using var committableTransaction = new CommittableTransaction();
 var propagationToken = TransactionInterop.GetTransmitterPropagationToken(committableTransaction);

 var dependentTransaction = TransactionInterop.GetTransactionFromTransmitterPropagationToken(propagationToken);

 using (var scope = new TransactionScope(dependentTransaction))
 {
 scope.Complete();
 }
 });

 [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))]
 public void GetExportCookie()
 => Test(() =>
Expand DownExpand Up@@ -472,7 +503,7 @@ private static void Test(Action action)
 // In CI, we sometimes get XACT_E_TMNOTAVAILABLE; when it happens, it's typically on the very first
 // attempt to connect to MSDTC (flaky/slow on-demand startup of MSDTC), though not only.
 // This catches that error and retries.
 int nRetries = 5;
 int nRetries = 60;

 while (true)
 {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Distributed transaction fixes#76310

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

roji
merged 2 commits into

from

Sep 30, 2022
 Merged


Distributed transaction fixes
#76310
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
469f503

Distributed transaction fixes


roji Sep 28, 2022
e068128

Fix member naming


roji Sep 29, 2022

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


18 changes: 16 additions & 2 deletions
...ies/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcProxyShimFactory.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,8 @@ internal sealed class DtcProxyShimFactory
 private readonly ConcurrentQueue<ITransactionTransmitter> _cachedTransmitters = new();
 private readonly ConcurrentQueue<ITransactionReceiver> _cachedReceivers = new();

 private static readonly int s_maxCachedInterfaces = Environment.ProcessorCount * 2;

 private readonly EventWaitHandle _eventHandle;

 private ITransactionDispenser _transactionDispenser = null!; // Late-initialized in ConnectToProxy
Expand DownExpand Up@@ -350,7 +352,13 @@ internal ITransactionTransmitter GetCachedTransmitter(ITransaction transaction)
 }

 internal void ReturnCachedTransmitter(ITransactionTransmitter transmitter)
 => _cachedTransmitters.Enqueue(transmitter);
 {
 if (_cachedTransmitters.Count < s_maxCachedInterfaces)
 {
 transmitter.Reset();
 _cachedTransmitters.Enqueue(transmitter);
Comment thread
stephentoub marked this conversation as resolved.

 }
 }

 internal ITransactionReceiver GetCachedReceiver()
 {
Expand All@@ -366,5 +374,11 @@ internal ITransactionReceiver GetCachedReceiver()
 }

 internal void ReturnCachedReceiver(ITransactionReceiver receiver)
 => _cachedReceivers.Enqueue(receiver);
 {
 if (_cachedReceivers.Count < s_maxCachedInterfaces)
 {
 receiver.Reset();
 _cachedReceivers.Enqueue(receiver);
 }
Comment thread
stephentoub marked this conversation as resolved.

 }
}

24 changes: 18 additions & 6 deletions
src/libraries/System.Transactions.Local/src/System/Transactions/TransactionState.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1867,7 +1867,6 @@ Guid promoterType
 return false;
 }


 internal override void CompleteBlockingClone(InternalTransaction tx)
 {
 // First try to complete one of the internal blocking clones
Expand DownExpand Up@@ -1900,17 +1899,23 @@ internal override void CompleteBlockingClone(InternalTransaction tx)
 Monitor.Exit(tx);
 try
 {
 dtx.Complete();
 try
 {
 dtx.Complete();
 }
 finally
 {
 dtx.Dispose();
 }
 }
 finally
 {
dtx.Dispose();
Monitor.Enter(tx);
 }
 }
 }
 }


 internal override void CompleteAbortingClone(InternalTransaction tx)
 {
 // If we have a phase1Volatile.VolatileDemux, we have a phase1 volatile enlistment
Expand All@@ -1937,11 +1942,18 @@ internal override void CompleteAbortingClone(InternalTransaction tx)
 Monitor.Exit(tx);
 try
 {
 dtx.Complete();
 try
 {
 dtx.Complete();
 }
 finally
 {
 dtx.Dispose();
 }
 }
 finally
 {
dtx.Dispose();
Monitor.Enter(tx);
 }
 }
 }
Expand Down

85 changes: 58 additions & 27 deletions
src/libraries/System.Transactions.Local/tests/OleTxTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,17 @@ public void Volatile_and_durable_enlistments(int volatileCount)

 [ConditionalFact(nameof(IsRemoteExecutorSupportedAndNotNano))]
 public void Promotion()
 => PromotionCore();

 // #76010
 [ConditionalFact(nameof(IsRemoteExecutorSupportedAndNotNano))]
 public void Promotion_twice()
 {
 PromotionCore();
 PromotionCore();
 }

 private void PromotionCore()
 {
 Test(() =>
 {
Expand DownExpand Up@@ -203,28 +214,30 @@ public void Promotion()
 static void Remote1(string propagationTokenFilePath)
 => Test(() =>
 {
 using var tx = new CommittableTransaction();

 var outcomeEvent = new AutoResetEvent(false);
 var enlistment = new TestEnlistment(Phase1Vote.Prepared, EnlistmentOutcome.Committed, outcomeReceived: outcomeEvent);
 tx.EnlistDurable(Guid.NewGuid(), enlistment, EnlistmentOptions.None);

 // We now have an OleTx transaction. Save its propagation token to disk so that the main process can read it when promoting.
 byte[] propagationToken = TransactionInterop.GetTransmitterPropagationToken(tx);
 File.WriteAllBytes(propagationTokenFilePath, propagationToken);
 using (var tx = new CommittableTransaction())
 {
 var enlistment = new TestEnlistment(Phase1Vote.Prepared, EnlistmentOutcome.Committed, outcomeReceived: outcomeEvent);
 tx.EnlistDurable(Guid.NewGuid(), enlistment, EnlistmentOptions.None);

 // Signal to the main process that the propagation token is ready to be read
using var waitHandle1 = new EventWaitHandle(initialState: false, EventResetMode.ManualReset, "System.Transactions.Tests.OleTxTests.Promotion1");
waitHandle1.Set();
// We now have an OleTx transaction. Save its propagation token to disk so that the main process can read it when promoting.
 byte[] propagationToken = TransactionInterop.GetTransmitterPropagationToken(tx);
 File.WriteAllBytes(propagationTokenFilePath, propagationToken);

 // The main process will now import our transaction via the propagation token, and propagate it to a 2nd process.
 // In the main process the transaction is delegated; we're the one who started it, and so we're the one who need to Commit.
 // When Commit() is called in the main process, that will trigger a SinglePhaseCommit on the PSPE which represents us. In SQL Server this
 // contacts the DB to actually commit the transaction with MSDTC. In this simulation we'll just use the wait handle again to trigger this.
 using var waitHandle3 = new EventWaitHandle(initialState: false, EventResetMode.ManualReset, "System.Transactions.Tests.OleTxTests.Promotion3");
 Assert.True(waitHandle3.WaitOne(Timeout));
 // Signal to the main process that the propagation token is ready to be read
 using var waitHandle1 = new EventWaitHandle(initialState: false, EventResetMode.ManualReset, "System.Transactions.Tests.OleTxTests.Promotion1");
 waitHandle1.Set();

 tx.Commit();
 // The main process will now import our transaction via the propagation token, and propagate it to a 2nd process.
 // In the main process the transaction is delegated; we're the one who started it, and so we're the one who need to Commit.
 // When Commit() is called in the main process, that will trigger a SinglePhaseCommit on the PSPE which represents us. In SQL Server this
 // contacts the DB to actually commit the transaction with MSDTC. In this simulation we'll just use the wait handle again to trigger this.
 using var waitHandle3 = new EventWaitHandle(initialState: false, EventResetMode.ManualReset, "System.Transactions.Tests.OleTxTests.Promotion3");
 Assert.True(waitHandle3.WaitOne(Timeout));

 tx.Commit();
 }

 // Wait for the commit to occur on our enlistment, then exit successfully.
 Assert.True(outcomeEvent.WaitOne(Timeout));
Expand All@@ -234,18 +247,20 @@ static void Remote1(string propagationTokenFilePath)
 static void Remote2(string exportCookieFilePath)
 => Test(() =>
 {
 var outcomeEvent = new AutoResetEvent(false);

 // Load the export cookie and enlist durably
 byte[] exportCookie = File.ReadAllBytes(exportCookieFilePath);
 using var tx = TransactionInterop.GetTransactionFromExportCookie(exportCookie);

 // Now enlist durably. This triggers promotion of the first PSPE, reading the propagation token.
 var outcomeEvent = new AutoResetEvent(false);
 var enlistment = new TestEnlistment(Phase1Vote.Prepared, EnlistmentOutcome.Committed, outcomeReceived: outcomeEvent);
 tx.EnlistDurable(Guid.NewGuid(), enlistment, EnlistmentOptions.None);
 using (var tx = TransactionInterop.GetTransactionFromExportCookie(exportCookie))
 {
 // Now enlist durably. This triggers promotion of the first PSPE, reading the propagation token.
 var enlistment = new TestEnlistment(Phase1Vote.Prepared, EnlistmentOutcome.Committed, outcomeReceived: outcomeEvent);
 tx.EnlistDurable(Guid.NewGuid(), enlistment, EnlistmentOptions.None);

 // Signal to the main process that we're enlisted and ready to commit
 using var waitHandle = new EventWaitHandle(initialState: false, EventResetMode.ManualReset, "System.Transactions.Tests.OleTxTests.Promotion2");
 waitHandle.Set();
 // Signal to the main process that we're enlisted and ready to commit
 using var waitHandle = new EventWaitHandle(initialState: false, EventResetMode.ManualReset, "System.Transactions.Tests.OleTxTests.Promotion2");
 waitHandle.Set();
 }

 // Wait for the main process to commit the transaction
 Assert.True(outcomeEvent.WaitOne(Timeout));
Expand DownExpand Up@@ -414,6 +429,22 @@ public void TransmitterPropagationToken()
 Assert.Equal(tx.TransactionInformation.DistributedIdentifier, tx2.TransactionInformation.DistributedIdentifier);
 });

 // #76010
 [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))]
 public void TransactionScope_with_DependentTransaction()
 => Test(() =>
 {
 using var committableTransaction = new CommittableTransaction();
 var propagationToken = TransactionInterop.GetTransmitterPropagationToken(committableTransaction);

 var dependentTransaction = TransactionInterop.GetTransactionFromTransmitterPropagationToken(propagationToken);

 using (var scope = new TransactionScope(dependentTransaction))
 {
 scope.Complete();
 }
 });

 [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))]
 public void GetExportCookie()
 => Test(() =>
Expand DownExpand Up@@ -472,7 +503,7 @@ private static void Test(Action action)
 // In CI, we sometimes get XACT_E_TMNOTAVAILABLE; when it happens, it's typically on the very first
 // attempt to connect to MSDTC (flaky/slow on-demand startup of MSDTC), though not only.
 // This catches that error and retries.
 int nRetries = 5;
 int nRetries = 60;

 while (true)
 {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Distributed transaction fixes#76310

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

roji
merged 2 commits into

from

Sep 30, 2022
 Merged


Distributed transaction fixes
#76310
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
469f503

Distributed transaction fixes


roji Sep 28, 2022
e068128

Fix member naming


roji Sep 29, 2022

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


18 changes: 16 additions & 2 deletions
...ies/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcProxyShimFactory.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,8 @@ internal sealed class DtcProxyShimFactory
 private readonly ConcurrentQueue<ITransactionTransmitter> _cachedTransmitters = new();
 private readonly ConcurrentQueue<ITransactionReceiver> _cachedReceivers = new();

 private static readonly int s_maxCachedInterfaces = Environment.ProcessorCount * 2;

 private readonly EventWaitHandle _eventHandle;

 private ITransactionDispenser _transactionDispenser = null!; // Late-initialized in ConnectToProxy
Expand DownExpand Up@@ -350,7 +352,13 @@ internal ITransactionTransmitter GetCachedTransmitter(ITransaction transaction)
 }

 internal void ReturnCachedTransmitter(ITransactionTransmitter transmitter)
 => _cachedTransmitters.Enqueue(transmitter);
 {
 if (_cachedTransmitters.Count < s_maxCachedInterfaces)
 {
 transmitter.Reset();
 _cachedTransmitters.Enqueue(transmitter);
Comment thread
stephentoub marked this conversation as resolved.

 }
 }

 internal ITransactionReceiver GetCachedReceiver()
 {
Expand All@@ -366,5 +374,11 @@ internal ITransactionReceiver GetCachedReceiver()
 }

 internal void ReturnCachedReceiver(ITransactionReceiver receiver)
 => _cachedReceivers.Enqueue(receiver);
 {
 if (_cachedReceivers.Count < s_maxCachedInterfaces)
 {
 receiver.Reset();
 _cachedReceivers.Enqueue(receiver);
 }
Comment thread
stephentoub marked this conversation as resolved.

 }
}

24 changes: 18 additions & 6 deletions
src/libraries/System.Transactions.Local/src/System/Transactions/TransactionState.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1867,7 +1867,6 @@ Guid promoterType
 return false;
 }


 internal override void CompleteBlockingClone(InternalTransaction tx)
 {
 // First try to complete one of the internal blocking clones
Expand DownExpand Up@@ -1900,17 +1899,23 @@ internal override void CompleteBlockingClone(InternalTransaction tx)
 Monitor.Exit(tx);
 try
 {
 dtx.Complete();
 try
 {
 dtx.Complete();
 }
 finally
 {
 dtx.Dispose();
 }
 }
 finally
 {
dtx.Dispose();
Monitor.Enter(tx);
 }
 }
 }
 }


 internal override void CompleteAbortingClone(InternalTransaction tx)
 {
 // If we have a phase1Volatile.VolatileDemux, we have a phase1 volatile enlistment
Expand All@@ -1937,11 +1942,18 @@ internal override void CompleteAbortingClone(InternalTransaction tx)
 Monitor.Exit(tx);
 try
 {
 dtx.Complete();
 try
 {
 dtx.Complete();
 }
 finally
 {
 dtx.Dispose();
 }
 }
 finally
 {
dtx.Dispose();
Monitor.Enter(tx);
 }
 }
 }
Expand Down

85 changes: 58 additions & 27 deletions
src/libraries/System.Transactions.Local/tests/OleTxTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,17 @@ public void Volatile_and_durable_enlistments(int volatileCount)

 [ConditionalFact(nameof(IsRemoteExecutorSupportedAndNotNano))]
 public void Promotion()
 => PromotionCore();

 // #76010
 [ConditionalFact(nameof(IsRemoteExecutorSupportedAndNotNano))]
 public void Promotion_twice()
 {
 PromotionCore();
 PromotionCore();
 }

 private void PromotionCore()
 {
 Test(() =>
 {
Expand DownExpand Up@@ -203,28 +214,30 @@ public void Promotion()
 static void Remote1(string propagationTokenFilePath)
 => Test(() =>
 {
 using var tx = new CommittableTransaction();

 var outcomeEvent = new AutoResetEvent(false);
 var enlistment = new TestEnlistment(Phase1Vote.Prepared, EnlistmentOutcome.Committed, outcomeReceived: outcomeEvent);
 tx.EnlistDurable(Guid.NewGuid(), enlistment, EnlistmentOptions.None);

 // We now have an OleTx transaction. Save its propagation token to disk so that the main process can read it when promoting.
 byte[] propagationToken = TransactionInterop.GetTransmitterPropagationToken(tx);
 File.WriteAllBytes(propagationTokenFilePath, propagationToken);
 using (var tx = new CommittableTransaction())
 {
 var enlistment = new TestEnlistment(Phase1Vote.Prepared, EnlistmentOutcome.Committed, outcomeReceived: outcomeEvent);
 tx.EnlistDurable(Guid.NewGuid(), enlistment, EnlistmentOptions.None);

 // Signal to the main process that the propagation token is ready to be read
using var waitHandle1 = new EventWaitHandle(initialState: false, EventResetMode.ManualReset, "System.Transactions.Tests.OleTxTests.Promotion1");
waitHandle1.Set();
// We now have an OleTx transaction. Save its propagation token to disk so that the main process can read it when promoting.
 byte[] propagationToken = TransactionInterop.GetTransmitterPropagationToken(tx);
 File.WriteAllBytes(propagationTokenFilePath, propagationToken);

 // The main process will now import our transaction via the propagation token, and propagate it to a 2nd process.
 // In the main process the transaction is delegated; we're the one who started it, and so we're the one who need to Commit.
 // When Commit() is called in the main process, that will trigger a SinglePhaseCommit on the PSPE which represents us. In SQL Server this
 // contacts the DB to actually commit the transaction with MSDTC. In this simulation we'll just use the wait handle again to trigger this.
 using var waitHandle3 = new EventWaitHandle(initialState: false, EventResetMode.ManualReset, "System.Transactions.Tests.OleTxTests.Promotion3");
 Assert.True(waitHandle3.WaitOne(Timeout));
 // Signal to the main process that the propagation token is ready to be read
 using var waitHandle1 = new EventWaitHandle(initialState: false, EventResetMode.ManualReset, "System.Transactions.Tests.OleTxTests.Promotion1");
 waitHandle1.Set();

 tx.Commit();
 // The main process will now import our transaction via the propagation token, and propagate it to a 2nd process.
 // In the main process the transaction is delegated; we're the one who started it, and so we're the one who need to Commit.
 // When Commit() is called in the main process, that will trigger a SinglePhaseCommit on the PSPE which represents us. In SQL Server this
 // contacts the DB to actually commit the transaction with MSDTC. In this simulation we'll just use the wait handle again to trigger this.
 using var waitHandle3 = new EventWaitHandle(initialState: false, EventResetMode.ManualReset, "System.Transactions.Tests.OleTxTests.Promotion3");
 Assert.True(waitHandle3.WaitOne(Timeout));

 tx.Commit();
 }

 // Wait for the commit to occur on our enlistment, then exit successfully.
 Assert.True(outcomeEvent.WaitOne(Timeout));
Expand All@@ -234,18 +247,20 @@ static void Remote1(string propagationTokenFilePath)
 static void Remote2(string exportCookieFilePath)
 => Test(() =>
 {
 var outcomeEvent = new AutoResetEvent(false);

 // Load the export cookie and enlist durably
 byte[] exportCookie = File.ReadAllBytes(exportCookieFilePath);
 using var tx = TransactionInterop.GetTransactionFromExportCookie(exportCookie);

 // Now enlist durably. This triggers promotion of the first PSPE, reading the propagation token.
 var outcomeEvent = new AutoResetEvent(false);
 var enlistment = new TestEnlistment(Phase1Vote.Prepared, EnlistmentOutcome.Committed, outcomeReceived: outcomeEvent);
 tx.EnlistDurable(Guid.NewGuid(), enlistment, EnlistmentOptions.None);
 using (var tx = TransactionInterop.GetTransactionFromExportCookie(exportCookie))
 {
 // Now enlist durably. This triggers promotion of the first PSPE, reading the propagation token.
 var enlistment = new TestEnlistment(Phase1Vote.Prepared, EnlistmentOutcome.Committed, outcomeReceived: outcomeEvent);
 tx.EnlistDurable(Guid.NewGuid(), enlistment, EnlistmentOptions.None);

 // Signal to the main process that we're enlisted and ready to commit
 using var waitHandle = new EventWaitHandle(initialState: false, EventResetMode.ManualReset, "System.Transactions.Tests.OleTxTests.Promotion2");
 waitHandle.Set();
 // Signal to the main process that we're enlisted and ready to commit
 using var waitHandle = new EventWaitHandle(initialState: false, EventResetMode.ManualReset, "System.Transactions.Tests.OleTxTests.Promotion2");
 waitHandle.Set();
 }

 // Wait for the main process to commit the transaction
 Assert.True(outcomeEvent.WaitOne(Timeout));
Expand DownExpand Up@@ -414,6 +429,22 @@ public void TransmitterPropagationToken()
 Assert.Equal(tx.TransactionInformation.DistributedIdentifier, tx2.TransactionInformation.DistributedIdentifier);
 });

 // #76010
 [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))]
 public void TransactionScope_with_DependentTransaction()
 => Test(() =>
 {
 using var committableTransaction = new CommittableTransaction();
 var propagationToken = TransactionInterop.GetTransmitterPropagationToken(committableTransaction);

 var dependentTransaction = TransactionInterop.GetTransactionFromTransmitterPropagationToken(propagationToken);

 using (var scope = new TransactionScope(dependentTransaction))
 {
 scope.Complete();
 }
 });

 [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))]
 public void GetExportCookie()
 => Test(() =>
Expand DownExpand Up@@ -472,7 +503,7 @@ private static void Test(Action action)
 // In CI, we sometimes get XACT_E_TMNOTAVAILABLE; when it happens, it's typically on the very first
 // attempt to connect to MSDTC (flaky/slow on-demand startup of MSDTC), though not only.
 // This catches that error and retries.
 int nRetries = 5;
 int nRetries = 60;

 while (true)
 {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Distributed transaction fixes#76310

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

roji
merged 2 commits into

from

Sep 30, 2022
 Merged


Distributed transaction fixes
#76310
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
469f503

Distributed transaction fixes


roji Sep 28, 2022
e068128

Fix member naming


roji Sep 29, 2022

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


18 changes: 16 additions & 2 deletions
...ies/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcProxyShimFactory.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,8 @@ internal sealed class DtcProxyShimFactory
 private readonly ConcurrentQueue<ITransactionTransmitter> _cachedTransmitters = new();
 private readonly ConcurrentQueue<ITransactionReceiver> _cachedReceivers = new();

 private static readonly int s_maxCachedInterfaces = Environment.ProcessorCount * 2;

 private readonly EventWaitHandle _eventHandle;

 private ITransactionDispenser _transactionDispenser = null!; // Late-initialized in ConnectToProxy
Expand DownExpand Up@@ -350,7 +352,13 @@ internal ITransactionTransmitter GetCachedTransmitter(ITransaction transaction)
 }

 internal void ReturnCachedTransmitter(ITransactionTransmitter transmitter)
 => _cachedTransmitters.Enqueue(transmitter);
 {
 if (_cachedTransmitters.Count < s_maxCachedInterfaces)
 {
 transmitter.Reset();
 _cachedTransmitters.Enqueue(transmitter);
Comment thread
stephentoub marked this conversation as resolved.

 }
 }

 internal ITransactionReceiver GetCachedReceiver()
 {
Expand All@@ -366,5 +374,11 @@ internal ITransactionReceiver GetCachedReceiver()
 }

 internal void ReturnCachedReceiver(ITransactionReceiver receiver)
 => _cachedReceivers.Enqueue(receiver);
 {
 if (_cachedReceivers.Count < s_maxCachedInterfaces)
 {
 receiver.Reset();
 _cachedReceivers.Enqueue(receiver);
 }
Comment thread
stephentoub marked this conversation as resolved.

 }
}

24 changes: 18 additions & 6 deletions
src/libraries/System.Transactions.Local/src/System/Transactions/TransactionState.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1867,7 +1867,6 @@ Guid promoterType
 return false;
 }


 internal override void CompleteBlockingClone(InternalTransaction tx)
 {
 // First try to complete one of the internal blocking clones
Expand DownExpand Up@@ -1900,17 +1899,23 @@ internal override void CompleteBlockingClone(InternalTransaction tx)
 Monitor.Exit(tx);
 try
 {
 dtx.Complete();
 try
 {
 dtx.Complete();
 }
 finally
 {
 dtx.Dispose();
 }
 }
 finally
 {
dtx.Dispose();
Monitor.Enter(tx);
 }
 }
 }
 }


 internal override void CompleteAbortingClone(InternalTransaction tx)
 {
 // If we have a phase1Volatile.VolatileDemux, we have a phase1 volatile enlistment
Expand All@@ -1937,11 +1942,18 @@ internal override void CompleteAbortingClone(InternalTransaction tx)
 Monitor.Exit(tx);
 try
 {
 dtx.Complete();
 try
 {
 dtx.Complete();
 }
 finally
 {
 dtx.Dispose();
 }
 }
 finally
 {
dtx.Dispose();
Monitor.Enter(tx);
 }
 }
 }
Expand Down

85 changes: 58 additions & 27 deletions
src/libraries/System.Transactions.Local/tests/OleTxTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,17 @@ public void Volatile_and_durable_enlistments(int volatileCount)

 [ConditionalFact(nameof(IsRemoteExecutorSupportedAndNotNano))]
 public void Promotion()
 => PromotionCore();

 // #76010
 [ConditionalFact(nameof(IsRemoteExecutorSupportedAndNotNano))]
 public void Promotion_twice()
 {
 PromotionCore();
 PromotionCore();
 }

 private void PromotionCore()
 {
 Test(() =>
 {
Expand DownExpand Up@@ -203,28 +214,30 @@ public void Promotion()
 static void Remote1(string propagationTokenFilePath)
 => Test(() =>
 {
 using var tx = new CommittableTransaction();

 var outcomeEvent = new AutoResetEvent(false);
 var enlistment = new TestEnlistment(Phase1Vote.Prepared, EnlistmentOutcome.Committed, outcomeReceived: outcomeEvent);
 tx.EnlistDurable(Guid.NewGuid(), enlistment, EnlistmentOptions.None);

 // We now have an OleTx transaction. Save its propagation token to disk so that the main process can read it when promoting.
 byte[] propagationToken = TransactionInterop.GetTransmitterPropagationToken(tx);
 File.WriteAllBytes(propagationTokenFilePath, propagationToken);
 using (var tx = new CommittableTransaction())
 {
 var enlistment = new TestEnlistment(Phase1Vote.Prepared, EnlistmentOutcome.Committed, outcomeReceived: outcomeEvent);
 tx.EnlistDurable(Guid.NewGuid(), enlistment, EnlistmentOptions.None);

 // Signal to the main process that the propagation token is ready to be read
using var waitHandle1 = new EventWaitHandle(initialState: false, EventResetMode.ManualReset, "System.Transactions.Tests.OleTxTests.Promotion1");
waitHandle1.Set();
// We now have an OleTx transaction. Save its propagation token to disk so that the main process can read it when promoting.
 byte[] propagationToken = TransactionInterop.GetTransmitterPropagationToken(tx);
 File.WriteAllBytes(propagationTokenFilePath, propagationToken);

 // The main process will now import our transaction via the propagation token, and propagate it to a 2nd process.
 // In the main process the transaction is delegated; we're the one who started it, and so we're the one who need to Commit.
 // When Commit() is called in the main process, that will trigger a SinglePhaseCommit on the PSPE which represents us. In SQL Server this
 // contacts the DB to actually commit the transaction with MSDTC. In this simulation we'll just use the wait handle again to trigger this.
 using var waitHandle3 = new EventWaitHandle(initialState: false, EventResetMode.ManualReset, "System.Transactions.Tests.OleTxTests.Promotion3");
 Assert.True(waitHandle3.WaitOne(Timeout));
 // Signal to the main process that the propagation token is ready to be read
 using var waitHandle1 = new EventWaitHandle(initialState: false, EventResetMode.ManualReset, "System.Transactions.Tests.OleTxTests.Promotion1");
 waitHandle1.Set();

 tx.Commit();
 // The main process will now import our transaction via the propagation token, and propagate it to a 2nd process.
 // In the main process the transaction is delegated; we're the one who started it, and so we're the one who need to Commit.
 // When Commit() is called in the main process, that will trigger a SinglePhaseCommit on the PSPE which represents us. In SQL Server this
 // contacts the DB to actually commit the transaction with MSDTC. In this simulation we'll just use the wait handle again to trigger this.
 using var waitHandle3 = new EventWaitHandle(initialState: false, EventResetMode.ManualReset, "System.Transactions.Tests.OleTxTests.Promotion3");
 Assert.True(waitHandle3.WaitOne(Timeout));

 tx.Commit();
 }

 // Wait for the commit to occur on our enlistment, then exit successfully.
 Assert.True(outcomeEvent.WaitOne(Timeout));
Expand All@@ -234,18 +247,20 @@ static void Remote1(string propagationTokenFilePath)
 static void Remote2(string exportCookieFilePath)
 => Test(() =>
 {
 var outcomeEvent = new AutoResetEvent(false);

 // Load the export cookie and enlist durably
 byte[] exportCookie = File.ReadAllBytes(exportCookieFilePath);
 using var tx = TransactionInterop.GetTransactionFromExportCookie(exportCookie);

 // Now enlist durably. This triggers promotion of the first PSPE, reading the propagation token.
 var outcomeEvent = new AutoResetEvent(false);
 var enlistment = new TestEnlistment(Phase1Vote.Prepared, EnlistmentOutcome.Committed, outcomeReceived: outcomeEvent);
 tx.EnlistDurable(Guid.NewGuid(), enlistment, EnlistmentOptions.None);
 using (var tx = TransactionInterop.GetTransactionFromExportCookie(exportCookie))
 {
 // Now enlist durably. This triggers promotion of the first PSPE, reading the propagation token.
 var enlistment = new TestEnlistment(Phase1Vote.Prepared, EnlistmentOutcome.Committed, outcomeReceived: outcomeEvent);
 tx.EnlistDurable(Guid.NewGuid(), enlistment, EnlistmentOptions.None);

 // Signal to the main process that we're enlisted and ready to commit
 using var waitHandle = new EventWaitHandle(initialState: false, EventResetMode.ManualReset, "System.Transactions.Tests.OleTxTests.Promotion2");
 waitHandle.Set();
 // Signal to the main process that we're enlisted and ready to commit
 using var waitHandle = new EventWaitHandle(initialState: false, EventResetMode.ManualReset, "System.Transactions.Tests.OleTxTests.Promotion2");
 waitHandle.Set();
 }

 // Wait for the main process to commit the transaction
 Assert.True(outcomeEvent.WaitOne(Timeout));
Expand DownExpand Up@@ -414,6 +429,22 @@ public void TransmitterPropagationToken()
 Assert.Equal(tx.TransactionInformation.DistributedIdentifier, tx2.TransactionInformation.DistributedIdentifier);
 });

 // #76010
 [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))]
 public void TransactionScope_with_DependentTransaction()
 => Test(() =>
 {
 using var committableTransaction = new CommittableTransaction();
 var propagationToken = TransactionInterop.GetTransmitterPropagationToken(committableTransaction);

 var dependentTransaction = TransactionInterop.GetTransactionFromTransmitterPropagationToken(propagationToken);

 using (var scope = new TransactionScope(dependentTransaction))
 {
 scope.Complete();
 }
 });

 [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))]
 public void GetExportCookie()
 => Test(() =>
Expand DownExpand Up@@ -472,7 +503,7 @@ private static void Test(Action action)
 // In CI, we sometimes get XACT_E_TMNOTAVAILABLE; when it happens, it's typically on the very first
 // attempt to connect to MSDTC (flaky/slow on-demand startup of MSDTC), though not only.
 // This catches that error and retries.
 int nRetries = 5;
 int nRetries = 60;

 while (true)
 {
Expand Down