set timeout for clone query

2 files changed, 9 insertions, 0 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/Query.java b/container-search/src/main/java/com/yahoo/search/Query.java
index 4ecede819de..8c3a30a5a4d 100644
--- a/container-search/src/main/java/com/yahoo/search/Query.java
+++ b/container-search/src/main/java/com/yahoo/search/Query.java
@@ -982,6 +982,7 @@ public class Query extends com.yahoo.processing.Request implements Cloneable {
         clone.properties().setParentQuery(clone);
         assert (clone.properties().getParentQuery() == clone);
 
+        clone.setTimeout(getTimeout());
         clone.setTraceLevel(getTraceLevel());
         clone.setExplainLevel(getExplainLevel());
         clone.setHits(getHits());
diff --git a/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java b/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java
index ecedcfd0f16..59178b9419a 100644
--- a/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java
@@ -295,6 +295,14 @@ public class QueryTestCase {
     }
 
     @Test
+    public void testCloneTimeout() {
+        Query q = new Query(httpEncode("/search?timeout=300ms"));
+        assertEquals(300, q.getTimeout());
+        Query clonedQ = q.clone();
+        assertEquals(300, clonedQ.getTimeout());
+    }
+
+    @Test
     public void testQueryProfileSubstitution1() {
         QueryProfile profile = new QueryProfile("myProfile");
         profile.set("myField", "Profile: %{queryProfile}", null);