Log less and no need to include version in log message when it's identical to the one we are building

1 files changed, 10 insertions, 6 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/PreparedModelsBuilder.java b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/PreparedModelsBuilder.java
index fc86629125f..49e200f9640 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/PreparedModelsBuilder.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/PreparedModelsBuilder.java
@@ -46,6 +46,8 @@ import java.util.concurrent.ExecutorService;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import static java.util.logging.Level.FINE;
+
 /**
  * @author bratseth
  */
@@ -102,7 +104,7 @@ public class PreparedModelsBuilder extends ModelsBuilder<PreparedModelsBuilder.P
                                                     Optional<DockerImage> wantedDockerImageRepository,
                                                     Version wantedNodeVespaVersion) {
         Version modelVersion = modelFactory.version();
-        log.log(Level.FINE, () -> "Building model " + modelVersion + " for " + applicationId);
+        log.log(FINE, () -> "Building model " + modelVersion + " for " + applicationId);
 
         // Use empty on non-hosted systems, use already allocated hosts if available, create connection to a host provisioner otherwise
         Provisioned provisioned = new Provisioned();
@@ -126,15 +128,17 @@ public class PreparedModelsBuilder extends ModelsBuilder<PreparedModelsBuilder.P
         return new PreparedModelResult(modelVersion, result.getModel(), fileRegistry, result.getConfigChangeActions());
     }
 
-    private ModelCreateResult createAndValidateModel(ModelFactory modelFactory, ApplicationId applicationId, Version modelVersion, ModelContext modelContext) {
-        log.log(zone().system().isCd() ? Level.INFO : Level.FINE,
-                () -> "Create and validate model " + modelVersion + " for " + applicationId + ", previous model is " +
-                modelOf(modelVersion).map(Model::version).map(Version::toFullString).orElse("non-existing"));
+    private ModelCreateResult createAndValidateModel(ModelFactory modelFactory,
+                                                     ApplicationId applicationId,
+                                                     Version modelVersion,
+                                                     ModelContext modelContext) {
+        log.log(FINE, () -> "Create and validate model " + modelVersion + " for " + applicationId +
+                ", previous model " + (modelOf(modelVersion).isPresent() ? " exists" : "does not exist"));
         ValidationParameters validationParameters =
                 new ValidationParameters(params.ignoreValidationErrors() ? IgnoreValidationErrors.TRUE : IgnoreValidationErrors.FALSE);
         ModelCreateResult result = modelFactory.createAndValidateModel(modelContext, validationParameters);
         validateModelHosts(hostValidator, applicationId, result.getModel());
-        log.log(Level.FINE, () -> "Done building model " + modelVersion + " for " + applicationId);
+        log.log(FINE, () -> "Done building model " + modelVersion + " for " + applicationId);
         params.getTimeoutBudget().assertNotTimedOut(() -> "prepare timed out after building model " + modelVersion +
                                                           " (timeout " + params.getTimeoutBudget().timeout() + "): " + applicationId);
         return result;