From 4f0d66e0be38fa9e6e681fa47f6ce5320f950f67 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Tue, 30 Nov 2021 10:58:29 +0100 Subject: Cleanup: No functional changes --- .../vespa/service/duper/ConfigServerHostApplication.java | 2 ++ .../com/yahoo/vespa/service/duper/DuperModelManager.java | 14 +++++++------- .../yahoo/vespa/service/duper/HostAdminApplication.java | 10 ++++++++-- .../com/yahoo/vespa/service/duper/InfraApplication.java | 1 + 4 files changed, 18 insertions(+), 9 deletions(-) (limited to 'service-monitor/src') diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/duper/ConfigServerHostApplication.java b/service-monitor/src/main/java/com/yahoo/vespa/service/duper/ConfigServerHostApplication.java index e4e5f513ebc..909b86886b8 100644 --- a/service-monitor/src/main/java/com/yahoo/vespa/service/duper/ConfigServerHostApplication.java +++ b/service-monitor/src/main/java/com/yahoo/vespa/service/duper/ConfigServerHostApplication.java @@ -4,7 +4,9 @@ package com.yahoo.vespa.service.duper; import com.yahoo.config.provision.NodeType; public class ConfigServerHostApplication extends HostAdminApplication { + public ConfigServerHostApplication() { super("configserver-host", NodeType.confighost); } + } diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/duper/DuperModelManager.java b/service-monitor/src/main/java/com/yahoo/vespa/service/duper/DuperModelManager.java index 7087995aa2e..67d54091adc 100644 --- a/service-monitor/src/main/java/com/yahoo/vespa/service/duper/DuperModelManager.java +++ b/service-monitor/src/main/java/com/yahoo/vespa/service/duper/DuperModelManager.java @@ -45,11 +45,11 @@ public class DuperModelManager implements DuperModelProvider, DuperModelInfraApi static final ConfigServerApplication configServerApplication = new ConfigServerApplication(); static final ProxyHostApplication proxyHostApplication = new ProxyHostApplication(); static final TenantHostApplication tenantHostApplication = new TenantHostApplication(); - static final DevHostApplication devHostApplicaton = new DevHostApplication(); + static final DevHostApplication devHostApplication = new DevHostApplication(); private final Map supportedInfraApplications; - private static CriticalRegionChecker disallowedDuperModeLockAcquisitionRegions = + private static final CriticalRegionChecker disallowedDuperModeLockAcquisitionRegions = new CriticalRegionChecker("duper model deadlock detection"); private final ReentrantLock lock = new ReentrantLock(true); @@ -68,13 +68,14 @@ public class DuperModelManager implements DuperModelProvider, DuperModelInfraApi } /** Non-private for testing */ - public DuperModelManager(boolean multitenant, boolean isController, SuperModelProvider superModelProvider, DuperModel duperModel, FlagSource flagSource, SystemName system) { + public DuperModelManager(boolean multitenant, boolean isController, SuperModelProvider superModelProvider, + DuperModel duperModel, FlagSource flagSource, SystemName system) { this.duperModel = duperModel; if (system == SystemName.dev) { // TODO (mortent): Support controllerApplication in dev system supportedInfraApplications = - Stream.of(devHostApplicaton, configServerApplication) + Stream.of(devHostApplication, configServerApplication) .collect(Collectors.toUnmodifiableMap(InfraApplication::getApplicationId, Function.identity())); } else if (multitenant) { supportedInfraApplications = @@ -129,9 +130,7 @@ public class DuperModelManager implements DuperModelProvider, DuperModelInfraApi return Optional.ofNullable(supportedInfraApplications.get(applicationId)); } - /** - * Returns true if application is considered an infrastructure application by the DuperModel. - */ + /** Returns true if application is considered an infrastructure application by the DuperModel. */ public boolean isSupportedInfraApplication(ApplicationId applicationId) { return supportedInfraApplications.containsKey(applicationId); } @@ -234,4 +233,5 @@ public class DuperModelManager implements DuperModelProvider, DuperModelInfraApi lock.unlock(); } } + } diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/duper/HostAdminApplication.java b/service-monitor/src/main/java/com/yahoo/vespa/service/duper/HostAdminApplication.java index 2c1b00f93a4..0b90350b7be 100644 --- a/service-monitor/src/main/java/com/yahoo/vespa/service/duper/HostAdminApplication.java +++ b/service-monitor/src/main/java/com/yahoo/vespa/service/duper/HostAdminApplication.java @@ -9,10 +9,16 @@ import com.yahoo.vespa.applicationmodel.ServiceType; * @author hakonhall */ public abstract class HostAdminApplication extends InfraApplication { + public static final int HOST_ADMIN_HEALT_PORT = 8080; protected HostAdminApplication(String applicationName, NodeType nodeType) { - super(applicationName, nodeType, ClusterSpec.Type.container, ClusterSpec.Id.from(applicationName), - ServiceType.HOST_ADMIN, HOST_ADMIN_HEALT_PORT); + super(applicationName, + nodeType, + ClusterSpec.Type.container, + ClusterSpec.Id.from(applicationName), + ServiceType.HOST_ADMIN, + HOST_ADMIN_HEALT_PORT); } + } diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/duper/InfraApplication.java b/service-monitor/src/main/java/com/yahoo/vespa/service/duper/InfraApplication.java index a3a13bc7b57..8a62db87e7c 100644 --- a/service-monitor/src/main/java/com/yahoo/vespa/service/duper/InfraApplication.java +++ b/service-monitor/src/main/java/com/yahoo/vespa/service/duper/InfraApplication.java @@ -170,4 +170,5 @@ public abstract class InfraApplication implements InfraApplicationApi { ", healthPort=" + healthPort + '}'; } + } -- cgit v1.2.3