Make transaction scope timeout the same as command timeout

erikbra · Feb 10, 2025 · 12a7151 · 12a7151
1 parent f4b5d51
commit 12a7151
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/grate.core/Migration/GrateMigrator.cs b/src/grate.core/Migration/GrateMigrator.cs
@@ -136,7 +136,17 @@ public async Task Migrate()
             // Start the transaction, if configured
             if (runInTransaction)
             {
-                scope = new TransactionScope(TransactionScopeAsyncFlowOption.Enabled);
+                // use command timeout as the max timeout and transaction scope timeout, if greater than current MaxTimeout
+                var maxTimeout = TransactionManager.MaxTimeout; 
+                var transactionTimeout = config.CommandTimeout > 0
+                    ? new [] {maxTimeout, TimeSpan.FromSeconds(config.CommandTimeout) }.Max();
+                    : maxTimeout;
+
+                if (transactionTimeout > maxTimeout)
+                {
+                    TransactionManager.MaxTimeout = transactionTimeout;
+                }
+                scope = new TransactionScope(TransactionScopeOption.Required, transactionTimeout, TransactionScopeAsyncFlowOption.Enabled);
             }
 
             bool exceptionOccured = false;