Increase ThreadPool thread count maximum to 50

2gis · Nov 10, 2015 · cd4eacd · cd4eacd
1 parent 729bdfe
commit cd4eacd
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 3 deletions.
diff --git a/config_template.py b/config_template.py
@@ -71,4 +71,6 @@ class Config(object):
     SELENIUM_PORT = 4455
     VMMASTER_AGENT_PORT = 9000
 
+    THREAD_POOL_MAX = 100
+
     LOG_LEVEL = "INFO"
diff --git a/tests/unit/data/config.py b/tests/unit/data/config.py
@@ -61,4 +61,6 @@ class Config(object):
     SELENIUM_PORT = 4455
     VMMASTER_AGENT_PORT = 9000
 
+    THREAD_POOL_MAX = 100
+
     LOG_LEVEL = "INFO"
diff --git a/tests/unit/data/config_openstack.py b/tests/unit/data/config_openstack.py
@@ -58,4 +58,6 @@ class Config(object):
     SELENIUM_PORT = 4455
     VMMASTER_AGENT_PORT = 9000
 
+    THREAD_POOL_MAX = 100
+
     LOG_LEVEL = "INFO"
diff --git a/tests/unit/data/config_with_preloaded.py b/tests/unit/data/config_with_preloaded.py
@@ -59,4 +59,6 @@ class Config(object):
     SELENIUM_PORT = 4455
     VMMASTER_AGENT_PORT = 9000
 
+    THREAD_POOL_MAX = 100
+
     LOG_LEVEL = "INFO"
diff --git a/vmmaster/server.py b/vmmaster/server.py
@@ -6,10 +6,12 @@
 from twisted.web.server import Site
 from twisted.web.resource import Resource
 from twisted.internet import defer
+from twisted.python.threadpool import ThreadPool
 from app import create_app
 
 from http_proxy import ProxyResource, HTTPChannelWithClient
 from core.logger import log
+from core.config import config
 
 
 def _block_on(d, timeout=None):
@@ -48,9 +50,11 @@ class VMMasterServer(object):
     def __init__(self, reactor, port):
         self.reactor = reactor
         self.app = create_app()
-        wsgi_resource = WSGIResource(self.reactor,
-                                     self.reactor.getThreadPool(),
-                                     self.app)
+
+        self.thread_pool = ThreadPool(maxthreads=config.THREAD_POOL_MAX)
+        self.thread_pool.start()
+        wsgi_resource = WSGIResource(self.reactor, self.thread_pool, self.app)
+
         root_resource = RootResource(wsgi_resource)
         root_resource.putChild("proxy", ProxyResource(self.app))
         site = Site(root_resource)
@@ -68,6 +72,7 @@ def __del__(self):
         d = self.bind.stopListening()
         _block_on(d, 20)
         self.app.cleanup()
+        self.thread_pool.stop()
 
     def wait_for_end_active_sessions(self):
         active_sessions = self.app.sessions.active()