diff options
author | Jon Marius Venstad <venstad@gmail.com> | 2020-10-29 09:28:07 +0100 |
---|---|---|
committer | Jon Marius Venstad <venstad@gmail.com> | 2020-10-29 09:28:07 +0100 |
commit | 4fe6f3d49419766df69117956b0e352f2b94fe94 (patch) | |
tree | 1e23fd1950ed89b10590c2dd818540b5c67bf6af | |
parent | 9962cd1d0efe6e0385d959e7d3aea36826de1c02 (diff) |
Set correct timeout on visitor session parameters
2 files changed, 6 insertions, 2 deletions
diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java index 4fdac7b584a..28e474ebc56 100644 --- a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java +++ b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java @@ -783,7 +783,7 @@ public class DocumentV1ApiHandler extends AbstractRequestHandler { parameters.setFieldSet(getProperty(request, FIELD_SET).orElse(path.documentType().map(type -> type + ":[document]").orElse(AllFields.NAME))); parameters.setMaxTotalHits(wantedDocumentCount); parameters.setThrottlePolicy(new StaticThrottlePolicy().setMaxPendingCount(concurrency)); - parameters.setTimeoutMs(visitTimeout.toMillis()); + parameters.setSessionTimeoutMs(visitTimeout.toMillis()); parameters.visitInconsistentBuckets(true); parameters.setPriority(DocumentProtocol.Priority.NORMAL_4); diff --git a/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java b/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java index 0295f9fa0dc..9e362069738 100644 --- a/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java +++ b/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java @@ -49,6 +49,7 @@ import com.yahoo.slime.Inspector; import com.yahoo.slime.JsonFormat; import com.yahoo.slime.SlimeUtils; import com.yahoo.test.ManualClock; +import com.yahoo.vdslib.VisitorStatistics; import com.yahoo.vespa.config.content.AllClustersBucketSpacesConfig; import org.junit.After; import org.junit.Before; @@ -197,7 +198,10 @@ public class DocumentV1ApiTest { ((DumpVisitorDataHandler) parameters.getLocalDataHandler()).onDocument(doc1, 0); ((DumpVisitorDataHandler) parameters.getLocalDataHandler()).onDocument(doc2, 0); ((DumpVisitorDataHandler) parameters.getLocalDataHandler()).onDocument(doc3, 0); - parameters.getControlHandler().onDone(VisitorControlHandler.CompletionCode.SUCCESS, "message"); + VisitorStatistics statistics = new VisitorStatistics(); + statistics.setBucketsVisited(1); + parameters.getControlHandler().onVisitorStatistics(statistics); + parameters.getControlHandler().onDone(VisitorControlHandler.CompletionCode.TIMEOUT, "timeout is OK"); }); response = driver.sendRequest("http://localhost/document/v1?cluster=content&bucketSpace=default&wantedDocumentCount=1025&concurrency=123" + "&selection=all%20the%20things&fieldSet=[id]"); |