diff options
4 files changed, 18 insertions, 19 deletions
diff --git a/client/js/app/yarn.lock b/client/js/app/yarn.lock index 248e1e2ac4a..1f6ebac1617 100644 --- a/client/js/app/yarn.lock +++ b/client/js/app/yarn.lock @@ -4656,9 +4656,9 @@ prettier-linter-helpers@^1.0.0: fast-diff "^1.1.2" prettier@3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.0.3.tgz#432a51f7ba422d1469096c0fdc28e235db8f9643" - integrity sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg== + version "3.1.0" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.1.0.tgz#c6d16474a5f764ea1a4a373c593b779697744d5e" + integrity sha512-TQLvXjq5IAibjh8EpBIkNKxO749UEWABoiIZehEPiY4GNpVdhaFKqSTu+QrlU6D2dPAfubRmtJTi4K4YkQ5eXw== pretty-format@^29.7.0: version "29.7.0" diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerBootstrap.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerBootstrap.java index c4fe8b42c25..07fee3c45d2 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerBootstrap.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerBootstrap.java @@ -103,7 +103,7 @@ public class ConfigServerBootstrap extends AbstractComponent implements Runnable @Override public void deconstruct() { - log.log(Level.INFO, "Stopping config server"); + log.log(Level.FINE, "Stopping config server"); down(); server.stop(); log.log(Level.FINE, "RPC server stopped"); @@ -220,13 +220,13 @@ public class ConfigServerBootstrap extends AbstractComponent implements Runnable // Keep track of deployment status per application Map<ApplicationId, Future<?>> deployments = new HashMap<>(); if (applicationIds.size() > 0) { - log.log(Level.INFO, () -> "Redeploying " + applicationIds.size() + " apps " + applicationIds + " with " + + log.log(Level.FINE, () -> "Redeploying " + applicationIds.size() + " apps " + applicationIds + " with " + configserverConfig.numRedeploymentThreads() + " threads"); applicationIds.forEach(appId -> deployments.put(appId, executor.submit(() -> { - log.log(Level.INFO, () -> "Starting redeployment of " + appId); + log.log(Level.FINE, () -> "Starting redeployment of " + appId); applicationRepository.deployFromLocalActive(appId, true /* bootstrap */) .ifPresent(Deployment::activate); - log.log(Level.INFO, () -> appId + " redeployed"); + log.log(Level.FINE, () -> appId + " redeployed"); }))); } diff --git a/parent/pom.xml b/parent/pom.xml index d6f56c34aad..15aee603f17 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1126,7 +1126,7 @@ See pluginManagement of rewrite-maven-plugin for more details --> <groupId>org.openrewrite.recipe</groupId> <artifactId>rewrite-recipe-bom</artifactId> - <version>2.4.1</version> + <version>2.5.0</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneContainerApplication.java b/standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneContainerApplication.java index 860d14a9333..4e7ae5418a1 100644 --- a/standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneContainerApplication.java +++ b/standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneContainerApplication.java @@ -49,7 +49,6 @@ import java.nio.file.Paths; import java.util.ArrayList; import java.util.List; import java.util.Optional; -import java.util.stream.Collectors; import static com.yahoo.collections.CollectionUtil.first; @@ -296,21 +295,21 @@ public class StandaloneContainerApplication implements Application { container.initService(deployState); } - private static Element getJDiscInServices(Element element) { - List<Element> jDiscElements = new ArrayList<>(); + private static Element getContainerElementInServices(Element element) { + List<Element> containerElements = new ArrayList<>(); for (ConfigModelId cid : ContainerModelBuilder.configModelIds) { List<Element> children = XML.getChildren(element, cid.getName()); - jDiscElements.addAll(children); + containerElements.addAll(children); } - if (jDiscElements.size() == 1) { - return jDiscElements.get(0); - } else if (jDiscElements.isEmpty()) { - throw new RuntimeException("No jdisc element found under services."); + if (containerElements.size() == 1) { + return containerElements.get(0); + } else if (containerElements.isEmpty()) { + throw new RuntimeException("No container element found under services."); } else { - List<String> nameAndId = jDiscElements.stream().map(e -> e.getNodeName() + " id='" + e.getAttribute("id") + "'") + List<String> nameAndId = containerElements.stream().map(e -> e.getNodeName() + " id='" + e.getAttribute("id") + "'") .toList(); - throw new RuntimeException("Found multiple JDisc elements: " + String.join(", ", nameAndId)); + throw new RuntimeException("Found multiple container elements: " + String.join(", ", nameAndId)); } } @@ -321,7 +320,7 @@ public class StandaloneContainerApplication implements Application { if (ContainerModelBuilder.configModelIds.stream().anyMatch(id -> id.getName().equals(nodeName))) { return element; } else { - return getJDiscInServices(element); + return getContainerElementInServices(element); } } |