diff options
| author | gjoranv <gjoranv@gmail.com> | 2018-06-19 11:51:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-19 11:51:52 +0200 |
| commit | 017d615e0aee5cb9210f2af9403819f51349f07a (patch) | |
| tree | 66187ef99268d2a721ede2ef0f1c3db1522e222c /configserver | |
| parent | 475256fb2ce39ef87f352655b8d4c66a70791999 (diff) | |
| parent | 3eae0d34a00570add245e39830452acded0c0238 (diff) | |
Merge pull request #6228 from vespa-engine/bratseth/nonfunctional-changes
Nonfunctional changes only
Diffstat (limited to 'configserver')
3 files changed, 6 insertions, 3 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 93e434c3b87..821162353d6 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 @@ -198,6 +198,7 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye * was not present for this id (meaning it either is not active or active on another * node in the config server cluster) */ + @Override public Optional<com.yahoo.config.provision.Deployment> deployFromLocalActive(ApplicationId application) { return deployFromLocalActive(application, Duration.ofSeconds(configserverConfig.zookeeper().barrierTimeout()).plus(Duration.ofSeconds(5))); } @@ -410,7 +411,7 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye public void validateThatRemoteSessionIsPrepared(Tenant tenant, long sessionId) { RemoteSession session = getRemoteSession(tenant, sessionId); - if (!Session.Status.PREPARE.equals(session.getStatus())) + if ( ! Session.Status.PREPARE.equals(session.getStatus())) throw new IllegalStateException("Session not prepared: " + sessionId); } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ReloadListener.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ReloadListener.java index 59783bf1af5..773a4862033 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/ReloadListener.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ReloadListener.java @@ -12,10 +12,10 @@ import java.util.Collection; * reloaded. It only exists because the RpcServer cannot distinguish between a * successful reload of a new application and a reload of the same application. * - * @author lulf - * @since 5.1 + * @author Ulf Lilleengen */ public interface ReloadListener { + /** * Signal the listener that hosts used by by a particular tenant. * @@ -47,4 +47,5 @@ public interface ReloadListener { * Must be thread-safe. */ void applicationRemoved(ApplicationId applicationId); + } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandler.java index f4c0a9fd47a..8d7023fef5b 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandler.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandler.java @@ -85,6 +85,7 @@ public class TenantRequestHandler implements RequestHandler, ReloadHandler, Host /** * Activates the config of the given app. Notifies listeners + * * @param applicationSet the {@link ApplicationSet} to be reloaded */ public void reloadConfig(ApplicationSet applicationSet) { |