Fix leadership spinning

Drawaes · Mar 21, 2019 · 2e62ddc · 2e62ddc
1 parent 576d317
commit 2e62ddc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/releasenotes/4.1.6.props b/releasenotes/4.1.6.props
@@ -0,0 +1,7 @@
+<Project>
+  <PropertyGroup>
+    <PackageReleaseNotes>
+* Fix spinning on leadership election
+</PackageReleaseNotes>
+  </PropertyGroup>
+</Project>
diff --git a/src/CondenserDotNet.Client/Leadership/LeaderWatcher.cs b/src/CondenserDotNet.Client/Leadership/LeaderWatcher.cs
@@ -53,7 +53,7 @@ private async Task TryForElection()
                 _electedLeaderEvent.Reset();
                 _currentLeaderEvent.Reset();
                 CondenserEventSource.Log.LeadershipTryToLock(_keyToWatch);
-                var leaderResult = await _serviceManager.Client.PutAsync($"{KeyPath}{_keyToWatch}?acquire={_sessionId}", GetServiceInformation());
+                var leaderResult = await _serviceManager.Client.PutAsync($"{KeyPath}{_keyToWatch}?acquire={_sessionId}&index={_consulIndex}", GetServiceInformation());
                 if (!leaderResult.IsSuccessStatusCode)
                 {
                     //error so we need to get a new session
@@ -72,6 +72,8 @@ private async Task TryForElection()
                     leaderResult = await _serviceManager.Client.GetAsync($"{KeyPath}{_keyToWatch}?index={_consulIndex}");
                     if (!leaderResult.IsSuccessStatusCode)
                     {
+                        _currentLeaderEvent.Reset();
+                        _electedLeaderEvent.Reset();
                         //error so return to create session
                         return;
                     }

diff --git a/version.props b/version.props
@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup>
-        <VersionPrefix>4.1.5</VersionPrefix>
+        <VersionPrefix>4.1.6</VersionPrefix>
         <VersionSuffix>beta</VersionSuffix>
     </PropertyGroup>
 </Project>