Merge lp:~rvb/maas/no-threadpool into lp:~maas-committers/maas/trunk

[Raphaël Badin]

Now that the default threadpool is much bigger, there is no reason to use a dedicated threadpool for the websockets.

[Gavin Panella (allenap)]

review: Approve

[Mike Pontillo (mpontillo)]

Looks good to me.

review: Approve

=== modified file 'src/maasserver/websockets/protocol.py'
--- src/maasserver/websockets/protocol.py	2015-03-30 17:22:25 +0000
+++ src/maasserver/websockets/protocol.py	2015-04-14 20:38:41 +0000
@@ -37,15 +37,13 @@
 from maasserver.websockets.listener import PostgresListener
 from maasserver.websockets.websockets import STATUSES
 from provisioningserver.utils.twisted import synchronous
-from twisted.internet import reactor
 from twisted.internet.defer import inlineCallbacks
 from twisted.internet.protocol import (
     Factory,
     Protocol,
 )
-from twisted.internet.threads import deferToThreadPool
+from twisted.internet.threads import deferToThread
 from twisted.python import log
-from twisted.python.threadpool import ThreadPool
 from twisted.web.server import NOT_DONE_YET
 
 
@@ -177,9 +175,7 @@
                 "Error authenticating user: %s" % failure.getErrorMessage())
             return None
 
-        d = deferToThreadPool(
-            reactor, self.factory.threadpool,
-            self.getUserFromSessionId, session_id)
+        d = deferToThread(self.getUserFromSessionId, session_id)
         d.addCallbacks(got_user, got_user_error)
 
         return d
@@ -258,8 +254,7 @@
         # performed. The execution of this method is defered to a thread
         # because it interacts with the database which is blocking.
         transactional_execute = transactional(handler.execute)
-        d = deferToThreadPool(
-            reactor, self.factory.threadpool,
+        d = deferToThread(
             transactional_execute, method, message.get("params", {}))
         d.addCallbacks(
             partial(self.sendResult, request_id),
@@ -305,31 +300,22 @@
 
 
 class WebSocketFactory(Factory):
-    """Factory for WebSocketProtocol.
-
-    :ivar threadpool: The thread-pool used for servicing websocket
-        requests.
-    """
 
     handlers = {}
     clients = []
 
     def __init__(self):
-        self.threadpool = ThreadPool(name=self.__class__.__name__)
         self.listener = PostgresListener()
         self.cacheHandlers()
         self.registerNotifiers()
 
     def startFactory(self):
-        """Start the thread pool and the listener."""
-        self.threadpool.start()
+        """Start the listener."""
         return self.listener.start()
 
     def stopFactory(self):
-        """Stop the thread pool and the listener."""
-        stopped = self.listener.stop()
-        self.threadpool.stop()
-        return stopped
+        """Stop the listener."""
+        return self.listener.stop()
 
     def getSessionEngine(self):
         """Returns the session engine being used by Django.
@@ -373,8 +359,7 @@
     def onNotify(self, handler_class, channel, action, obj_id):
         for client in self.clients:
             handler = handler_class(client.user, client.cache)
-            data = yield deferToThreadPool(
-                reactor, self.threadpool,
+            data = yield deferToThread(
                 self.processNotify, handler, channel, action, obj_id)
             if data is not None:
                 (name, data) = data

=== modified file 'src/maasserver/websockets/tests/test_protocol.py'
--- src/maasserver/websockets/tests/test_protocol.py	2015-03-30 22:05:13 +0000
+++ src/maasserver/websockets/tests/test_protocol.py	2015-04-14 20:38:41 +0000
@@ -47,14 +47,12 @@
 from testtools.matchers import (
     Equals,
     Is,
-    IsInstance,
 )
 from twisted.internet.defer import (
     fail,
     inlineCallbacks,
 )
 from twisted.internet.threads import deferToThread
-from twisted.python.threadpool import ThreadPool
 from twisted.web.server import NOT_DONE_YET
 
 
@@ -63,8 +61,6 @@
     def make_protocol(self, patch_authenticate=True, transport_uri=''):
         self.patch(protocol_module, "PostgresListener")
         factory = WebSocketFactory()
-        factory.startFactory()
-        self.addCleanup(factory.stopFactory)
         protocol = factory.buildProtocol(None)
         protocol.transport = MagicMock()
         protocol.transport.uri = transport_uri
@@ -525,9 +521,9 @@
         self.addCleanup(self.clean_node, node)
         protocol, factory = self.make_protocol()
         protocol.user = MagicMock()
-        mock_deferToThreadPool = self.patch_autospec(
-            protocol_module, "deferToThreadPool")
-        mock_deferToThreadPool.return_value = fail(
+        mock_deferToThread = self.patch_autospec(
+            protocol_module, "deferToThread")
+        mock_deferToThread.return_value = fail(
             maas_factory.make_exception("error"))
         message = {
             "type": MSG_TYPE.REQUEST,
@@ -565,8 +561,6 @@
 
     def make_protocol_with_factory(self, user=None):
         factory = WebSocketFactory()
-        factory.startFactory()
-        self.addCleanup(factory.stopFactory)
         protocol = factory.buildProtocol(None)
         protocol.transport = MagicMock()
         if user is None:
@@ -624,31 +618,12 @@
 
     @wait_for_reactor
     @inlineCallbacks
-    def test_startFactory_starts_threadpool(self):
-        factory = WebSocketFactory()
-        yield factory.startFactory()
-        try:
-            self.assertThat(factory.threadpool, IsInstance(ThreadPool))
-            self.expectThat(factory.threadpool.started, Equals(True))
-        finally:
-            yield factory.stopFactory()
-
-    @wait_for_reactor
-    @inlineCallbacks
     def test_stopFactory_stops_listener(self):
         factory = WebSocketFactory()
         yield factory.startFactory()
         yield factory.stopFactory()
         self.expectThat(factory.listener.connected(), Equals(False))
 
-    @wait_for_reactor
-    @inlineCallbacks
-    def test_stopFactory_stops_threadpool(self):
-        factory = WebSocketFactory()
-        yield factory.startFactory()
-        yield factory.stopFactory()
-        self.assertEqual([], factory.threadpool.threads)
-
     def test_registerNotifiers_registers_all_notifiers(self):
         factory = WebSocketFactory()
         self.assertItemsEqual(