5 files changed, 18 insertions, 18 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/JobControl.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/JobControl.java
index 53400f56feb..d16d9f06d28 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/JobControl.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/JobControl.java
@@ -2,7 +2,7 @@
 package com.yahoo.vespa.hosted.provision.maintenance;
 
 import com.yahoo.vespa.hosted.provision.persistence.CuratorDatabaseClient;
-import com.yahoo.vespa.curator.CuratorMutex;
+import com.yahoo.vespa.curator.Lock;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -47,7 +47,7 @@ public class JobControl {
 
     /** Set a job active or inactive */
     public void setActive(String jobSimpleClassName, boolean active) {
-        try (CuratorMutex lock = db.lockInactiveJobs()) {
+        try (Lock lock = db.lockInactiveJobs()) {
             Set<String> inactiveJobs = db.readInactiveJobs();
             if (active)
                 inactiveJobs.remove(jobSimpleClassName);
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabase.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabase.java
index 4244a66e798..a6e058e72f3 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabase.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabase.java
@@ -5,7 +5,7 @@ import com.google.common.collect.ImmutableList;
 import com.yahoo.path.Path;
 import com.yahoo.transaction.NestedTransaction;
 import com.yahoo.vespa.curator.Curator;
-import com.yahoo.vespa.curator.CuratorMutex;
+import com.yahoo.vespa.curator.Lock;
 import com.yahoo.vespa.curator.recipes.CuratorCounter;
 import com.yahoo.vespa.curator.transaction.CuratorTransaction;
 
@@ -42,7 +42,7 @@ public class CuratorDatabase {
      * All keys, to allow reentrancy.
      * This will grow forever with the number of applications seen, but this should be too slow to be a problem.
      */
-    private final ConcurrentHashMap<Path, CuratorMutex> locks = new ConcurrentHashMap<>();
+    private final ConcurrentHashMap<Path, Lock> locks = new ConcurrentHashMap<>();
 
     /**
      * Creates a curator database
@@ -59,8 +59,8 @@ public class CuratorDatabase {
 
     /** Create a reentrant lock */
     // Locks are not cached in the in-memory state
-    public CuratorMutex lock(Path path, Duration timeout) {
-        CuratorMutex lock = locks.computeIfAbsent(path, (pathArg) -> new CuratorMutex(pathArg.getAbsolute(), curator.framework()));
+    public Lock lock(Path path, Duration timeout) {
+        Lock lock = locks.computeIfAbsent(path, (pathArg) -> new Lock(pathArg.getAbsolute(), curator.framework()));
         lock.acquire(timeout);
         return lock;
     }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java
index 71faf627196..3c69c9b6fe9 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java
@@ -12,7 +12,7 @@ import com.yahoo.log.LogLevel;
 import com.yahoo.path.Path;
 import com.yahoo.transaction.NestedTransaction;
 import com.yahoo.vespa.curator.Curator;
-import com.yahoo.vespa.curator.CuratorMutex;
+import com.yahoo.vespa.curator.Lock;
 import com.yahoo.vespa.curator.transaction.CuratorOperations;
 import com.yahoo.vespa.curator.transaction.CuratorTransaction;
 import com.yahoo.vespa.hosted.provision.Node;
@@ -276,17 +276,17 @@ public class CuratorDatabaseClient {
     }
 
     /** Acquires the single cluster-global, reentrant lock for all non-active nodes */
-    public CuratorMutex lockInactive() {
+    public Lock lockInactive() {
         return lock(root.append("locks").append("unallocatedLock"), defaultLockTimeout);
     }
 
     /** Acquires the single cluster-global, reentrant lock for active nodes of this application */
-    public CuratorMutex lock(ApplicationId application) {
+    public Lock lock(ApplicationId application) {
         return lock(application, defaultLockTimeout);
     }
 
     /** Acquires the single cluster-global, reentrant lock with the specified timeout for active nodes of this application */
-    public CuratorMutex lock(ApplicationId application, Duration timeout) {
+    public Lock lock(ApplicationId application, Duration timeout) {
         try {
             return lock(lockPath(application), timeout);
         }
@@ -295,7 +295,7 @@ public class CuratorDatabaseClient {
         }
     }
 
-    private CuratorMutex lock(Path path, Duration timeout) {
+    private Lock lock(Path path, Duration timeout) {
         return curatorDatabase.lock(path, timeout);
     }
 
@@ -332,7 +332,7 @@ public class CuratorDatabaseClient {
         transaction.commit();
     }
     
-    public CuratorMutex lockInactiveJobs() {
+    public Lock lockInactiveJobs() {
         return lock(root.append("locks").append("inactiveJobsLock"), defaultLockTimeout);
     }
 
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClientTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClientTest.java
index 0a5e149d332..a9dc5647a0f 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClientTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClientTest.java
@@ -8,7 +8,7 @@ import com.yahoo.config.provision.NodeType;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.config.provision.Zone;
 import com.yahoo.vespa.curator.Curator;
-import com.yahoo.vespa.curator.CuratorMutex;
+import com.yahoo.vespa.curator.Lock;
 import com.yahoo.vespa.curator.mock.MockCurator;
 import com.yahoo.vespa.hosted.provision.Node;
 import com.yahoo.vespa.hosted.provision.provisioning.FlavorConfigBuilder;
@@ -43,18 +43,18 @@ public class CuratorDatabaseClientTest {
     public void locks_can_be_acquired_and_released() {
         ApplicationId app = ApplicationId.from(TenantName.from("testTenant"), ApplicationName.from("testApp"), InstanceName.from("testInstance"));
 
-        try (CuratorMutex mutex1 = zkClient.lock(app)) {
+        try (Lock mutex1 = zkClient.lock(app)) {
             mutex1.toString(); // reference to avoid warning
             throw new RuntimeException();
         }
         catch (RuntimeException expected) {
         }
 
-        try (CuratorMutex mutex2 = zkClient.lock(app)) {
+        try (Lock mutex2 = zkClient.lock(app)) {
             mutex2.toString(); // reference to avoid warning
         }
 
-        try (CuratorMutex mutex3 = zkClient.lock(app)) {
+        try (Lock mutex3 = zkClient.lock(app)) {
             mutex3.toString(); // reference to avoid warning
         }
 
diff --git a/zkfacade/src/main/java/com/yahoo/vespa/curator/CuratorMutex.java b/zkfacade/src/main/java/com/yahoo/vespa/curator/Lock.java
index e3dee56fcd6..25e575cdb6a 100644
--- a/zkfacade/src/main/java/com/yahoo/vespa/curator/CuratorMutex.java
+++ b/zkfacade/src/main/java/com/yahoo/vespa/curator/Lock.java
@@ -14,12 +14,12 @@ import java.util.concurrent.TimeUnit;
  *
  * @author bratseth
  */
-public class CuratorMutex implements Mutex {
+public class Lock implements Mutex {
 
     private final InterProcessMutex mutex;
     private final String lockPath;
 
-    public CuratorMutex(String lockPath, CuratorFramework curator) {
+    public Lock(String lockPath, CuratorFramework curator) {
         this.lockPath = lockPath;
         mutex = new InterProcessMutex(curator, lockPath);
     }