Jason R. Coombs avatar Jason R. Coombs committed 90165fe

Implemented proposed fix for #1205 - now when growing the thread pool, threads are only added after they're confirmed to be ready.

Comments (0)

Files changed (2)

cherrypy/wsgiserver/wsgiserver2.py

     finally:
         etype = value = tb = None
 
+import operator
 
 from urllib import unquote
 import warnings
         n_new = min(amount, budget)
 
         workers = [self._spawn_worker() for i in range(n_new)]
+        while not self._all_ready(workers):
+            time.sleep(.1)
         self._threads.extend(workers)
 
     def _spawn_worker(self):
         worker.start()
         return worker
 
+    def _all_ready(workers):
+        ready_states = [worker.ready for worker in workers]
+        return reduce(operator.and_, ready_states)
+    _all_ready = staticmethod(_all_ready)
+
     def shrink(self, amount):
         """Kill off worker threads (not below self.min)."""
         # Grow/shrink the pool if necessary.

cherrypy/wsgiserver/wsgiserver3.py

         n_new = min(amount, budget)
 
         workers = [self._spawn_worker() for i in range(n_new)]
+        while not all(worker.ready for worker in workers):
+            time.sleep(.1)
         self._threads.extend(workers)
 
     def _spawn_worker(self):
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.