summaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2018-01-31 15:32:42 +0100
committerGitHub <noreply@github.com>2018-01-31 15:32:42 +0100
commit7338b3fe9d4d20b4cce70fe7c8a8ce527fa232d6 (patch)
treef9dfa452396c66e44d1e43acfa67aaa15fa7c238 /configserver
parent08c0421ae234faa0960f187a672fb41108b1ca18 (diff)
parent587317c27582df1adffef4f1f90915f089087d42 (diff)
Merge pull request #4845 from vespa-engine/hmusum/log-when-sctivate-times-out
Log when activate times out (low-level timeout in jdisc)
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandler.java10
1 files changed, 10 insertions, 0 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandler.java
index fc2b4c62dde..07e9d1bd236 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandler.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandler.java
@@ -10,6 +10,9 @@ import com.yahoo.config.provision.TenantName;
import com.yahoo.config.provision.Zone;
import com.yahoo.container.jdisc.HttpRequest;
import com.yahoo.container.jdisc.HttpResponse;
+import com.yahoo.jdisc.Request;
+import com.yahoo.jdisc.handler.ResponseHandler;
+import com.yahoo.log.LogLevel;
import com.yahoo.vespa.config.server.ApplicationRepository;
import com.yahoo.vespa.config.server.tenant.Tenant;
import com.yahoo.vespa.config.server.tenant.Tenants;
@@ -54,4 +57,11 @@ public class SessionActiveHandler extends SessionHandler {
return new SessionActiveResponse(metaData.getSlime(), request, applicationId, sessionId, zone);
}
+ // Overridden to make sure we are logging when this low-level handling of timeout happens
+ @Override
+ public void handleTimeout(Request request, ResponseHandler responseHandler) {
+ log.log(LogLevel.ERROR, "activate timed out for " + request.getUri(), new RuntimeException("activate timed out"));
+ super.handleTimeout(request, responseHandler);
+ }
+
}