diff options
author | Harald Musum <musum@verizonmedia.com> | 2019-09-20 11:27:36 +0200 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2019-09-20 11:27:36 +0200 |
commit | 90330ac7bab872cb34569a0bdb76e7eda36e59ab (patch) | |
tree | fd6ce7d72bcbb112511e7fb9057fdbfb7d004450 /configserver | |
parent | 24a4cb04a1ab9cbbb6114502ea4c4928735ade93 (diff) |
Log file references used when activating app
Diffstat (limited to 'configserver')
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java | 11 |
1 files changed, 9 insertions, 2 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 0e17a31886b..da97199e83c 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 @@ -5,7 +5,6 @@ import com.google.common.io.Files; import com.google.inject.Inject; import com.yahoo.cloud.config.ConfigserverConfig; import com.yahoo.component.Version; -import com.yahoo.component.Vtag; import com.yahoo.config.FileReference; import com.yahoo.config.application.api.ApplicationFile; import com.yahoo.config.application.api.ApplicationMetaData; @@ -71,8 +70,10 @@ import java.time.Duration; import java.time.Instant; import java.util.Arrays; import java.util.Collection; +import java.util.HashMap; import java.util.HashSet; import java.util.List; +import java.util.Map; import java.util.Optional; import java.util.Set; import java.util.logging.Level; @@ -326,7 +327,9 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye Deployment deployment = deployFromPreparedSession(localSession, tenant, timeoutBudget.timeLeft()); deployment.setIgnoreSessionStaleFailure(ignoreSessionStaleFailure); deployment.activate(); - return localSession.getApplicationId(); + ApplicationId applicationId = localSession.getApplicationId(); + log.log(LogLevel.INFO, "File references used by " + applicationId + ": " + getFileReferences(applicationId)); + return applicationId; } private Deployment deployFromPreparedSession(LocalSession session, Tenant tenant, Duration timeout) { @@ -444,6 +447,10 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye return fileReferencesToDelete; } + private Set<FileReference> getFileReferences(ApplicationId applicationId) { + return getOptionalApplication(applicationId).map(app -> app.getModel().fileReferences()).orElse(Set.of()); + } + public ApplicationFile getApplicationFileFromSession(TenantName tenantName, long sessionId, String path, LocalSession.Mode mode) { Tenant tenant = tenantRepository.getTenant(tenantName); return getLocalSession(tenant, sessionId).getApplicationFile(Path.fromString(path), mode); |