Ensure lock is cleared when lease is invalidated

1 files changed, 9 insertions, 7 deletions

diff --git a/zkfacade/src/main/java/com/yahoo/vespa/curator/SingletonManager.java b/zkfacade/src/main/java/com/yahoo/vespa/curator/SingletonManager.java
index 8eda57b0476..f4074f9df77 100644
--- a/zkfacade/src/main/java/com/yahoo/vespa/curator/SingletonManager.java
+++ b/zkfacade/src/main/java/com/yahoo/vespa/curator/SingletonManager.java
@@ -336,14 +336,16 @@ class SingletonManager {
                     shouldBeActive = false;
                 }
             }
-            if (active && ! shouldBeActive) {
+            if ( ! shouldBeActive) {
                 logger.log(FINE, () -> "Doom value is " + doom);
-                try  {
-                    if ( ! singletons.isEmpty()) metrics.deactivation(singletons.peek()::deactivate);
-                    active = false;
-                }
-                catch (RuntimeException e) {
-                    logger.log(WARNING, "Failed to deactivate " + singletons.peek(), e);
+                if (active) {
+                    try {
+                        if (!singletons.isEmpty()) metrics.deactivation(singletons.peek()::deactivate);
+                        active = false;
+                    }
+                    catch (RuntimeException e) {
+                        logger.log(WARNING, "Failed to deactivate " + singletons.peek(), e);
+                    }
                 }
                 unlock();
             }