diff options
author | Jon Bratseth <bratseth@yahoo-inc.com> | 2016-11-11 16:38:05 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2016-11-11 16:38:05 +0100 |
commit | e8b5a1759630a90e0bf825fc9e613a7bddac80f1 (patch) | |
tree | f4ece17a0432daee707851a79a94ce2318346d48 /configserver | |
parent | f19bd859036b2adaba57b9561cb21ae43d8e0d9a (diff) |
Nonfunctional changes only
Diffstat (limited to 'configserver')
3 files changed, 7 insertions, 4 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java index 253a00a5931..893f26bb50b 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java @@ -130,9 +130,11 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye NestedTransaction transaction = new NestedTransaction(); localSessionRepo.removeSession(session.getSessionId(), transaction); - session.delete(transaction); // TODO: Not tested + session.delete(transaction); // TODO: Not unit tested - transaction.add(new Rotations(owner.get().getCurator(), owner.get().getPath()).delete(applicationId)); // TODO: Not tested + transaction.add(new Rotations(owner.get().getCurator(), owner.get().getPath()).delete(applicationId)); // TODO: Not unit tested + // (When rotations are updated in zk, we need to redeploy the zone app, on the right config server + // this is done asynchronously in application maintenance by the node repository) transaction.add(tenantApplications.deleteApplication(applicationId)); @@ -143,7 +145,7 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye return true; } - + public String grabLog(Tenant tenant, ApplicationId applicationId) { Application application = getApplication(tenant, applicationId); return logServerLogGrabber.grabLog(application); diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java index a753db90a7a..7f26795a003 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java @@ -107,6 +107,7 @@ public class ModelContextImpl implements ModelContext { * @author lulf */ public static class Properties implements ModelContext.Properties { + private final ApplicationId applicationId; private final boolean multitenant; private final List<ConfigServerSpec> configServerSpecs; diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/Rotations.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/Rotations.java index bc36cda5284..8fb843af1eb 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/Rotations.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/Rotations.java @@ -22,7 +22,7 @@ import java.util.stream.Collectors; * @author hmusum * @author bratseth */ -// TODO: This should be owned by the correct Tenant object +// TODO: This should be owned by the correct Tenant object and the rotations set should be contained in this public class Rotations { private final Path path; |