2 files changed, 3 insertions, 1 deletions
diff --git a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsVisitor.java b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsVisitor.java
index 06835076f40..ca2bd9c4b05 100644
--- a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsVisitor.java
+++ b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsVisitor.java
@@ -125,7 +125,8 @@ class VdsVisitor extends VisitorDataHandler implements Visitor {
         } else if (query.properties().getString(streamingSelection) != null) {
             params.setDocumentSelection(query.properties().getString(streamingSelection));
         }
-        params.setTimeoutMs(query.getTimeout());
+        params.setTimeoutMs(query.getTimeout()); // Per bucket visitor timeout
+        params.setSessionTimeoutMs(query.getTimeout());
         params.setVisitorLibrary("searchvisitor");
         params.setLocalDataHandler(this);
         params.setVisitHeadersOnly(query.properties().getBoolean(streamingHeadersonly));
diff --git a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsVisitorTestCase.java b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsVisitorTestCase.java
index 8c6322256fc..f6c269452cc 100644
--- a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsVisitorTestCase.java
+++ b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsVisitorTestCase.java
@@ -277,6 +277,7 @@ public class VdsVisitorTestCase {
 
         // Verify parameters based only on query
         assertEquals(qa.timeout*1000, params.getTimeoutMs());
+        assertEquals(qa.timeout*1000, params.getSessionTimeoutMs());
         assertEquals("searchvisitor", params.getVisitorLibrary());
         assertEquals(Integer.MAX_VALUE, params.getMaxPending());
         assertEquals(qa.traceLevel, params.getTraceLevel());