diff options
| author | Haakon Dybdahl <dybis@users.noreply.github.com> | 2017-01-24 15:14:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-24 15:14:02 +0100 |
| commit | a354546eb53563351c7edbf70a9b78af3b8cea71 (patch) | |
| tree | 773baad46920e63759189b4c849258297d89b241 /vespaclient-container-plugin | |
| parent | 7f61302dd2bd095c3a58babfa1d97fe26dffd5c5 (diff) | |
| parent | 4a2ea530434ae53885aa68377704021c30fa6d9a (diff) | |
Merge pull request #1589 from yahoo/dybdahl/more-threads
Allow more threads for document/v1 api.
Diffstat (limited to 'vespaclient-container-plugin')
3 files changed, 6 insertions, 4 deletions
diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/RestApi.java b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/RestApi.java index 6a7797c20a7..f6a6ed05e57 100644 --- a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/RestApi.java +++ b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/RestApi.java @@ -53,7 +53,7 @@ public class RestApi extends LoggingRequestHandler { private final OperationHandler operationHandler; private SingleDocumentParser singleDocumentParser; private ObjectMapper mapper = new ObjectMapper(); - private AtomicInteger threadsAvailableForApi = new AtomicInteger(20 /*max concurrent requests */); + private AtomicInteger threadsAvailableForApi = new AtomicInteger(200 /*max concurrent requests */); @Inject public RestApi(Executor executor, AccessLog accessLog, DocumentmanagerConfig documentManagerConfig, @@ -69,9 +69,11 @@ public class RestApi extends LoggingRequestHandler { public RestApi( Executor executor, AccessLog accessLog, - OperationHandler operationHandler) { + OperationHandler operationHandler, + int threadsAvailable) { super(executor, accessLog); this.operationHandler = operationHandler; + this.threadsAvailableForApi.set(threadsAvailable); } @Override diff --git a/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/RestApiMaxThreadTest.java b/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/RestApiMaxThreadTest.java index 17a36c142ea..d1eb32af48e 100644 --- a/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/RestApiMaxThreadTest.java +++ b/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/RestApiMaxThreadTest.java @@ -20,7 +20,7 @@ public class RestApiMaxThreadTest { private class RestApiMocked extends RestApi { public RestApiMocked() { - super(mock(Executor.class), null, (OperationHandler)null); + super(mock(Executor.class), null, (OperationHandler)null, 20); } @Override diff --git a/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/RestApiWithTestDocumentHandler.java b/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/RestApiWithTestDocumentHandler.java index 1c0252704ea..138916f6979 100644 --- a/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/RestApiWithTestDocumentHandler.java +++ b/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/RestApiWithTestDocumentHandler.java @@ -22,7 +22,7 @@ public class RestApiWithTestDocumentHandler extends RestApi{ Executor executor, AccessLog accessLog, OperationHandler operationHandler) { - super(executor, accessLog, operationHandler); + super(executor, accessLog, operationHandler, 20); DocumentType documentType = new DocumentType("testdocument"); |