diff options
author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2022-04-06 11:50:54 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-04-06 11:50:54 +0200 |
commit | 3c4cddd0b08666e497996e7f5b499e5a86fc68eb (patch) | |
tree | d501dd339043e3ae9fb43beb26f286782499223d /controller-server | |
parent | 5e0741b529762f73286fe0c3c2d3e101b864ba57 (diff) | |
parent | 8fb5133add361363d85af5eb65e3e0c6545400ba (diff) |
Merge pull request #21995 from vespa-engine/hmusum/transition-to-new-locks-for-controller
Start using new Curator locks in controller
Diffstat (limited to 'controller-server')
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java | 57 |
1 files changed, 44 insertions, 13 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java index 6eaad63251c..f4349919f4e 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java @@ -14,6 +14,7 @@ import com.yahoo.slime.Slime; import com.yahoo.slime.SlimeUtils; import com.yahoo.vespa.curator.Curator; import com.yahoo.vespa.curator.Lock; +import com.yahoo.vespa.curator.MultiplePathsLock; import com.yahoo.vespa.hosted.controller.Application; import com.yahoo.vespa.hosted.controller.api.identifiers.DeploymentId; import com.yahoo.vespa.hosted.controller.api.integration.archive.ArchiveBucket; @@ -143,20 +144,21 @@ public class CuratorDb { return curator.lock(lockPath(name), defaultLockTimeout.multipliedBy(2)); } + // TODO: Remove MultiplePathsLock and use of legacyLockPath() methods after 7.752 has been rolled out public Lock lock(TenantAndApplicationId id) { - return curator.lock(lockPath(id), defaultLockTimeout.multipliedBy(2)); + return new MultiplePathsLock(lockPath(id), legacyLockPath(id), defaultLockTimeout.multipliedBy(2),curator); } public Lock lockForDeployment(ApplicationId id, ZoneId zone) { - return curator.lock(lockPath(id, zone), deployLockTimeout); + return new MultiplePathsLock(lockPath(id, zone), legacyLockPath(id, zone), deployLockTimeout, curator); } public Lock lock(ApplicationId id, JobType type) { - return curator.lock(lockPath(id, type), defaultLockTimeout); + return new MultiplePathsLock(lockPath(id, type), legacyLockPath(id, type), defaultLockTimeout, curator); } public Lock lock(ApplicationId id, JobType type, Step step) throws TimeoutException { - return tryLock(lockPath(id, type, step)); + return tryLock(lockPath(id, type, step), legacyLockPath(id, type, step)); } public Lock lockRotations() { @@ -239,6 +241,19 @@ public class CuratorDb { } } + /** Try locking with a low timeout, meaning it is OK to fail lock acquisition. + * + * Useful for maintenance jobs, where there is no point in running the jobs back to back. + */ + private Lock tryLock(Path path, Path path2) throws TimeoutException { + try { + return new MultiplePathsLock(path, path2, tryLockTimeout, curator); + } + catch (UncheckedTimeoutException e) { + throw new TimeoutException(e.getMessage()); + } + } + private <T> Optional<T> read(Path path, Function<byte[], T> mapper) { return curator.getData(path).filter(data -> data.length > 0).map(mapper); } @@ -667,32 +682,48 @@ public class CuratorDb { .append(tenant.value()); } - private Path lockPath(TenantAndApplicationId application) { + private Path legacyLockPath(TenantAndApplicationId application) { return lockPath(application.tenant()) .append(application.application().value()); } - private Path lockPath(ApplicationId instance) { - return lockPath(TenantAndApplicationId.from(instance)) + private Path legacyLockPath(ApplicationId instance) { + return legacyLockPath(TenantAndApplicationId.from(instance)) .append(instance.instance().value()); } - private Path lockPath(ApplicationId instance, ZoneId zone) { - return lockPath(instance) + private Path legacyLockPath(ApplicationId instance, ZoneId zone) { + return legacyLockPath(instance) .append(zone.environment().value()) .append(zone.region().value()); } - private Path lockPath(ApplicationId instance, JobType type) { - return lockPath(instance) + private Path legacyLockPath(ApplicationId instance, JobType type) { + return legacyLockPath(instance) .append(type.jobName()); } - private Path lockPath(ApplicationId instance, JobType type, Step step) { - return lockPath(instance, type) + private Path legacyLockPath(ApplicationId instance, JobType type, Step step) { + return legacyLockPath(instance, type) .append(step.name()); } + private Path lockPath(TenantAndApplicationId application) { + return lockRoot.append(application.tenant().value() + ":" + application.application().value()); + } + + private Path lockPath(ApplicationId instance, ZoneId zone) { + return lockRoot.append(instance.serializedForm() + ":" + zone.environment().value() + ":" + zone.region().value()); + } + + private Path lockPath(ApplicationId instance, JobType type) { + return lockRoot.append(instance.serializedForm() + ":" + type.jobName()); + } + + private Path lockPath(ApplicationId instance, JobType type, Step step) { + return lockRoot.append(instance.serializedForm() + ":" + type.jobName() + ":" + step.name()); + } + private Path lockPath(String provisionId) { return lockRoot .append(provisionStatePath()) |