Add preferred Orchestrator lock

1 files changed, 7 insertions, 1 deletions

diff --git a/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java b/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java
index 41c774f13c3..15257e11cbe 100644
--- a/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java
+++ b/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java
@@ -21,6 +21,7 @@ import org.apache.curator.framework.state.ConnectionState;
 import org.apache.curator.framework.state.ConnectionStateListener;
 import org.apache.curator.retry.ExponentialBackoffRetry;
 
+import java.io.Closeable;
 import java.time.Duration;
 import java.util.Arrays;
 import java.util.Collections;
@@ -40,7 +41,7 @@ import java.util.concurrent.TimeUnit;
  * @author vegardh
  * @author bratseth
  */
-public class Curator {
+public class Curator implements AutoCloseable {
 
     private static final long UNKNOWN_HOST_TIMEOUT_MILLIS = TimeUnit.MINUTES.toMillis(30);
     private static final int ZK_SESSION_TIMEOUT = 30000;
@@ -269,6 +270,11 @@ public class Curator {
         return curatorFramework;
     }
 
+    @Override
+    public void close() {
+        curatorFramework.close();
+    }
+
     /**
      * Interface for waiting for completion of an operation
      */