summaryrefslogtreecommitdiffstats
path: root/configserver/src
diff options
context:
space:
mode:
authorJon Marius Venstad <venstad@gmail.com>2021-10-12 10:34:54 +0200
committerJon Marius Venstad <venstad@gmail.com>2021-10-12 10:34:54 +0200
commit26cdf9ae606149a4f5cf79475c390be818884ea3 (patch)
tree60515dbf2d5c0611f3ab06d63cc63005cd8ad692 /configserver/src
parent87c26111db1a8071ad58a0d78fc455a3e765a3fa (diff)
Reduce log level and change message for restart and reindexing on cloud
Diffstat (limited to 'configserver/src')
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java20
1 files changed, 14 insertions, 6 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 fac5be432b3..368324fa843 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
@@ -1080,11 +1080,15 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
@Override
public Duration serverDeployTimeout() { return Duration.ofSeconds(configserverConfig.zookeeper().barrierTimeout()); }
- private static void logConfigChangeActions(ConfigChangeActions actions, DeployLogger logger) {
+ private void logConfigChangeActions(ConfigChangeActions actions, DeployLogger logger) {
RestartActions restartActions = actions.getRestartActions();
if ( ! restartActions.isEmpty()) {
- logger.log(Level.WARNING, "Change(s) between active and new application that require restart:\n" +
- restartActions.format());
+ if (configserverConfig().hostedVespa())
+ logger.log(Level.INFO, "Orchestrated service restart triggered due to change(s) from active to new application:\n" +
+ restartActions.format());
+ else
+ logger.log(Level.WARNING, "Change(s) between active and new application that require restart:\n" +
+ restartActions.format());
}
RefeedActions refeedActions = actions.getRefeedActions();
if ( ! refeedActions.isEmpty()) {
@@ -1094,9 +1098,13 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
}
ReindexActions reindexActions = actions.getReindexActions();
if ( ! reindexActions.isEmpty()) {
- logger.log(Level.WARNING,
- "Change(s) between active and new application that may require re-index:\n" +
- reindexActions.format());
+ if (configserverConfig().hostedVespa())
+ logger.log(Level.INFO, "Re-indexing triggered due to change(s) from active to new application:\n" +
+ reindexActions.format());
+ else
+ logger.log(Level.WARNING,
+ "Change(s) between active and new application that may require re-index:\n" +
+ reindexActions.format());
}
}