Repository: airavata Updated Branches: refs/heads/master 593d5a7c0 -> baa69e894
increasing min threads for the thread pool - AIRAVATA-1266 Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/baa69e89 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/baa69e89 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/baa69e89 Branch: refs/heads/master Commit: baa69e8945d6eac98f0f2111eaf8dc8c752a03fc Parents: 593d5a7 Author: Chathuri Wimalasena <[email protected]> Authored: Fri May 23 10:35:31 2014 -0400 Committer: Chathuri Wimalasena <[email protected]> Committed: Fri May 23 10:35:31 2014 -0400 ---------------------------------------------------------------------- .../java/org/apache/airavata/api/server/AiravataAPIServer.java | 4 +++- .../main/java/org/apache/airavata/api/server/util/Constants.java | 1 + .../server/src/main/resources/airavata-server.properties | 4 +++- .../apache/airavata/orchestrator/server/OrchestratorServer.java | 4 +++- .../java/org/apache/airavata/orchestrator/util/Constants.java | 1 + 5 files changed, 11 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/baa69e89/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/AiravataAPIServer.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/AiravataAPIServer.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/AiravataAPIServer.java index 30a9145..dfe050d 100644 --- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/AiravataAPIServer.java +++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/AiravataAPIServer.java @@ -59,7 +59,9 @@ public class AiravataAPIServer implements IServer{ RegistryInitUtil.initializeDB(); final int serverPort = Integer.parseInt(ServerSettings.getSetting(Constants.THRIFT_SERVER_PORT,"8930")); TServerTransport serverTransport = new TServerSocket(serverPort); - server = new TThreadPoolServer(new TThreadPoolServer.Args(serverTransport).processor(mockAiravataServer)); + TThreadPoolServer.Args options = new TThreadPoolServer.Args(serverTransport); + options.minWorkerThreads = Integer.parseInt(ServerSettings.getSetting(Constants.API_SERVER_MIN_THREADS, "30")); + server = new TThreadPoolServer(options.processor(mockAiravataServer)); new Thread() { public void run() { server.serve(); http://git-wip-us.apache.org/repos/asf/airavata/blob/baa69e89/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/Constants.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/Constants.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/Constants.java index a3da94e..cfd7d82 100644 --- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/Constants.java +++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/Constants.java @@ -24,5 +24,6 @@ package org.apache.airavata.api.server.util; public class Constants { public static final String THRIFT_SERVER_PORT = "apiserver.server.port"; public static final String APP_CATALOG_SERVER_PORT = "app.catalog.server.port"; + public static final String API_SERVER_MIN_THREADS = "apiserver.server.min.threads"; } http://git-wip-us.apache.org/repos/asf/airavata/blob/baa69e89/modules/configuration/server/src/main/resources/airavata-server.properties ---------------------------------------------------------------------- diff --git a/modules/configuration/server/src/main/resources/airavata-server.properties b/modules/configuration/server/src/main/resources/airavata-server.properties index 6086792..ab2da7d 100644 --- a/modules/configuration/server/src/main/resources/airavata-server.properties +++ b/modules/configuration/server/src/main/resources/airavata-server.properties @@ -316,4 +316,6 @@ [email protected] apiserver.server.port=8930 -app.catalog.server.port=8931 \ No newline at end of file +app.catalog.server.port=8931 +apiserver.server.min.threads=30 +orchestrator.server.min.threads=30 http://git-wip-us.apache.org/repos/asf/airavata/blob/baa69e89/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServer.java ---------------------------------------------------------------------- diff --git a/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServer.java b/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServer.java index d6ff5c3..7580bfa 100644 --- a/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServer.java +++ b/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServer.java @@ -54,7 +54,9 @@ public class OrchestratorServer implements IServer{ TServerTransport serverTransport = new TServerSocket(serverPort); //server = new TSimpleServer( // new TServer.Args(serverTransport).processor(orchestratorServerHandlerProcessor)); - server = new TThreadPoolServer(new TThreadPoolServer.Args(serverTransport).processor(orchestratorServerHandlerProcessor)); + TThreadPoolServer.Args options = new TThreadPoolServer.Args(serverTransport); + options.minWorkerThreads = Integer.parseInt(ServerSettings.getSetting(Constants.ORCHESTRATOT_SERVER_MIN_THREADS, "30")); + server = new TThreadPoolServer(options.processor(orchestratorServerHandlerProcessor)); new Thread() { public void run() { http://git-wip-us.apache.org/repos/asf/airavata/blob/baa69e89/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/util/Constants.java ---------------------------------------------------------------------- diff --git a/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/util/Constants.java b/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/util/Constants.java index 6be3829..78177d0 100644 --- a/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/util/Constants.java +++ b/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/util/Constants.java @@ -23,5 +23,6 @@ package org.apache.airavata.orchestrator.util; public class Constants { public static final String ORCHESTRATOT_SERVER_PORT = "orchestrator.server.port"; + public static final String ORCHESTRATOT_SERVER_MIN_THREADS = "orchestrator.server.min.threads"; }
