Modify lock functionality

Fixes hashicorp#3 because the session was not properly deleted, causing sessions to not delete keys with SessionBehavior as Delete. Fixes hashicorp#6 Fixes hashicorp#5
KrolikROJER · May 21, 2015 · 4c969ae · 4c969ae
1 parent 5d53415
commit 4c969ae
Show file tree

Hide file tree

Showing 5 changed files with 272 additions and 102 deletions.
diff --git a/Consul.Test/LockTest.cs b/Consul.Test/LockTest.cs
@@ -31,7 +31,7 @@ public class LockTest
         public void Lock_AcquireRelease()
         {
             var c = ClientTest.MakeClient();
-            var lockKey = c.Lock("test/lock");
+            var lockKey = c.CreateLock("test/lock");
 
             try
             {
@@ -81,6 +81,16 @@ public void Lock_AcquireRelease()
             Assert.IsFalse(lockKey.IsHeld);
         }
 
+        [TestMethod]
+        public void Lock_EphemeralAcquireRelease()
+        {
+            var c = ClientTest.MakeClient();
+            using (var l = c.AcquireLock(new LockOptions("test/ephemerallock") { SessionBehavior = SessionBehavior.Delete }))
+            {
+                Assert.IsTrue(l.IsHeld);
+            }
+        }
+
         [TestMethod]
         public void Lock_Contend()
         {
@@ -96,7 +106,7 @@ public void Lock_Contend()
                 var v = i;
                 acquireTasks[i] = new Task(() =>
                 {
-                    var lockKey = c.Lock(key);
+                    var lockKey = c.CreateLock(key);
                     lockKey.Acquire(CancellationToken.None);
                     acquired[v] = lockKey.IsHeld;
                     if (lockKey.IsHeld)
@@ -108,7 +118,7 @@ public void Lock_Contend()
                 acquireTasks[i].Start();
             }
 
-            Task.WaitAll(acquireTasks, (int)(3 * Lock.DefaultLockRetryTime.TotalMilliseconds));
+            Task.WaitAll(acquireTasks, (int)(10 * Lock.DefaultLockRetryTime.TotalMilliseconds));
 
             foreach (var item in acquired)
             {
@@ -121,7 +131,7 @@ public void Lock_Destroy()
         {
             var c = ClientTest.MakeClient();
             var key = "test/lock";
-            var lockKey = c.Lock(key);
+            var lockKey = c.CreateLock(key);
             try
             {
                 lockKey.Acquire(CancellationToken.None);
@@ -142,7 +152,7 @@ public void Lock_Destroy()
 
                 Assert.IsFalse(lockKey.IsHeld);
 
-                var lockKey2 = c.Lock(key);
+                var lockKey2 = c.CreateLock(key);
 
                 lockKey2.Acquire(CancellationToken.None);
 
@@ -216,7 +226,7 @@ public void Lock_SemaphoreConflict()
 
             Assert.IsTrue(sema.IsHeld);
 
-            var lockKey = c.Lock("test/lock/.lock");
+            var lockKey = c.CreateLock("test/lock/.lock");
             try
             {
                 lockKey.Acquire(CancellationToken.None);
@@ -251,12 +261,12 @@ public void Lock_ReclaimLock()
             sessReq.Wait();
             var sess = sessReq.Result.Response;
 
-            var lockOpts = c.Lock(new LockOptions("test/lock")
+            var lockOpts = c.CreateLock(new LockOptions("test/lock")
             {
                 Session = sess
             });
 
-            var lockKey2 = c.Lock(new LockOptions("test/lock")
+            var lockKey2 = c.CreateLock(new LockOptions("test/lock")
             {
                 Session = sess
             });
@@ -267,7 +277,11 @@ public void Lock_ReclaimLock()
 
                 Assert.IsTrue(lockOpts.IsHeld);
 
-                Task.Run(() => lockKey2.Acquire(CancellationToken.None));
+                Task.Run(() =>
+                {
+                    Debugger.Break();
+                    lockKey2.Acquire(CancellationToken.None);
+                });
 
                 var lock2Hold = new Task(() =>
                 {
@@ -278,7 +292,7 @@ public void Lock_ReclaimLock()
                 });
                 lock2Hold.Start();
 
-                Task.WaitAny(new[] { lock2Hold }, 1000);
+                Task.WaitAny(new[] { lock2Hold }, 100000);
 
                 Assert.IsTrue(lockKey2.IsHeld);
             }
@@ -328,7 +342,7 @@ public void Lock_ReclaimLock()
         public void Lock_ForceInvalidate()
         {
             var c = ClientTest.MakeClient();
-            var lockKey = c.Lock("test/lock");
+            var lockKey = c.CreateLock("test/lock");
             try
             {
                 lockKey.Acquire(CancellationToken.None);
@@ -372,7 +386,7 @@ public void Lock_ForceInvalidate()
         public void Lock_DeleteKey()
         {
             var c = ClientTest.MakeClient();
-            var lockKey = c.Lock("test/lock");
+            var lockKey = c.CreateLock("test/lock");
             try
             {
                 lockKey.Acquire(CancellationToken.None);

diff --git a/Consul.Test/SemaphoreTest.cs b/Consul.Test/SemaphoreTest.cs
@@ -299,7 +299,7 @@ public void Semaphore_Conflict()
         {
             var c = ClientTest.MakeClient();
 
-            var semaphoreLock = c.Lock("test/sema/.lock");
+            var semaphoreLock = c.CreateLock("test/sema/.lock");
 
             semaphoreLock.Acquire(CancellationToken.None);