diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-11-15 13:59:33 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-15 13:59:33 +0100 |
commit | a729c7dca0efcbbf0de590b42cd931f0c3fa13bf (patch) | |
tree | c5b968b05d368c4ced2bc239c9d0026d836071ba | |
parent | 8a5a64a96c2ab3a222bac8d2bb15875dd194ea7a (diff) | |
parent | 4afb0541b117829f2d9f276c202a2c224e5e3b37 (diff) |
Merge pull request #20012 from vespa-engine/hmusum/log-session-id
Log session id when preprocessing application package fails
3 files changed, 7 insertions, 2 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ApplicationPackageMaintainer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ApplicationPackageMaintainer.java index 5702a6b78cf..1f30781ff03 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ApplicationPackageMaintainer.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ApplicationPackageMaintainer.java @@ -78,7 +78,7 @@ public class ApplicationPackageMaintainer extends ConfigServerMaintainer { if (fileDownloader.getFile(download).isEmpty()) { failures++; log.warning("Failed to download application package (" + appFileReference + ")" + - "for " + applicationId + " (session " + sessionId + ")"); + " for " + applicationId + " (session " + sessionId + ")"); continue; } } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java index 5a0a9b1d796..ce592c3282a 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java @@ -242,7 +242,8 @@ public class SessionPreparer { try { this.preprocessedApplicationPackage = applicationPackage.preprocess(properties.zone(), logger); } catch (IOException | RuntimeException e) { - throw new IllegalArgumentException("Error preprocessing application package for " + applicationId, e); + throw new IllegalArgumentException("Error preprocessing application package for " + applicationId + + ", session " + sessionZooKeeperClient.sessionId(), e); } checkTimeout("preprocess"); } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java index 11b2881bc34..0b34bd95f8e 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java @@ -66,6 +66,7 @@ public class SessionZooKeeperClient { private final Curator curator; private final TenantName tenantName; + private final long sessionId; private final Path sessionPath; private final Path sessionStatusPath; private final String serverId; // hostname @@ -75,6 +76,7 @@ public class SessionZooKeeperClient { public SessionZooKeeperClient(Curator curator, TenantName tenantName, long sessionId, String serverId, AddFileInterface fileManager, int maxNodeSize) { this.curator = curator; this.tenantName = tenantName; + this.sessionId = sessionId; this.sessionPath = getSessionPath(tenantName, sessionId); this.serverId = serverId; this.sessionStatusPath = sessionPath.append(ZKApplication.SESSIONSTATE_ZK_SUBPATH); @@ -106,6 +108,8 @@ public class SessionZooKeeperClient { } } + public long sessionId() { return sessionId; } + public CompletionWaiter createActiveWaiter() { return createCompletionWaiter(ACTIVE_BARRIER); } CompletionWaiter createPrepareWaiter() { return createCompletionWaiter(PREPARE_BARRIER); } |