Merge branch 'hotfix-3.0.5'

Particular · Mar 5, 2018 · 7ef7a57 · 7ef7a57
2 parents 3f1e7e9 + 772947d
commit 7ef7a57
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 2 deletions.
diff --git a/src/SqlPersistence.Tests/Saga/SagaPersisterTests.cs b/src/SqlPersistence.Tests/Saga/SagaPersisterTests.cs
@@ -228,6 +228,47 @@ public async Task Complete()
         }
     }
 
+    [Test]
+    public async Task CompleteFailsOnConcurrencyViolation()
+    {
+        var endpointName = nameof(Complete);
+        var definition = new SagaDefinition(
+            tableSuffix: "SagaWithCorrelation",
+            name: "SagaWithCorrelation",
+            correlationProperty: new CorrelationProperty
+            (
+                name: "CorrelationProperty",
+                type: CorrelationPropertyType.String
+            ),
+            transitionalCorrelationProperty: new CorrelationProperty
+            (
+                name: "TransitionalCorrelationProperty",
+                type: CorrelationPropertyType.String
+            )
+        );
+        DropAndCreate(definition, endpointName, schema);
+        var id = Guid.NewGuid();
+        var sagaData = new SagaWithCorrelation.SagaData
+        {
+            Id = id,
+            OriginalMessageId = "theOriginalMessageId",
+            Originator = "theOriginator",
+            CorrelationProperty = "theCorrelationProperty"
+        };
+
+        var persister = SetUp(endpointName, schema);
+
+        using (var connection = dbConnection())
+        using (var transaction = connection.BeginTransaction())
+        using (var storageSession = new StorageSession(connection, transaction, true, null))
+        {
+            await persister.Save(sagaData, storageSession, "theProperty").ConfigureAwait(false);
+
+            const int invalidConcurrencyVersion = 42;
+            Assert.ThrowsAsync<Exception>(() => persister.Complete(sagaData, storageSession, invalidConcurrencyVersion));
+        }
+    }
+
     public class SagaWithWeirdCharactersಠ_ಠ :
         SqlSaga<SagaWithWeirdCharactersಠ_ಠ.SagaData>,
         IAmStartedByMessages<AMessage>

diff --git a/src/SqlPersistence/Saga/SagaPersister_Complete.cs b/src/SqlPersistence/Saga/SagaPersister_Complete.cs
@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System;
+using System.Threading.Tasks;
 using NServiceBus;
 using NServiceBus.Extensibility;
 using NServiceBus.Persistence;
@@ -21,7 +22,11 @@ internal async Task Complete(IContainSagaData sagaData, SynchronizedStorageSessi
             command.Transaction = sqlSession.Transaction;
             command.AddParameter("Id", sagaData.Id);
             command.AddParameter("Concurrency", concurrency);
-            await command.ExecuteNonQueryAsync().ConfigureAwait(false);
+            var affected = await command.ExecuteNonQueryAsync().ConfigureAwait(false);
+            if (affected != 1)
+            {
+                throw new Exception($"Optimistic concurrency violation when trying to complete saga {sagaInfo.SagaType.FullName} {sagaData.Id}. Expected version {concurrency}.");
+            }
         }
     }
 }