Skip to content

Commit

Permalink
fix: Fixed default threadpool count for pyver> 3.9 (#1575)
Browse files Browse the repository at this point in the history 
* Fixed default threadpool count for pyver> 3.9

* ptptc test fixes

* test fixes + adding 312 test

---------

Co-authored-by: Victoria Hall <[email protected]>
  • Loading branch information
@gavin-aguiar
gavin-aguiar and Victoria Hall authored Sep 18, 2024
1 parent ceac558 commit 67bb824
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 9 deletions.
6 changes: 3 additions & 3 deletions azure_functions_worker/dispatcher.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
from .bindings.shared_memory_data_transfer import SharedMemoryManager
from .constants import (
APPLICATIONINSIGHTS_CONNECTION_STRING,
HTTP_URI,
METADATA_PROPERTIES_WORKER_INDEXED,
PYTHON_AZURE_MONITOR_LOGGER_NAME,
PYTHON_AZURE_MONITOR_LOGGER_NAME_DEFAULT,
Expand All @@ -39,8 +40,7 @@
PYTHON_THREADPOOL_THREAD_COUNT_DEFAULT,
PYTHON_THREADPOOL_THREAD_COUNT_MAX_37,
PYTHON_THREADPOOL_THREAD_COUNT_MIN,
REQUIRES_ROUTE_PARAMETERS,
HTTP_URI
REQUIRES_ROUTE_PARAMETERS
)
from .extension import ExtensionManager
from .http_v2 import (
Expand Down Expand Up @@ -966,7 +966,7 @@ def tp_max_workers_validator(value: str) -> bool:

# Starting Python 3.9, worker won't be putting a limit on the
# max_workers count in the created threadpool.
default_value = None if sys.version_info.minor == 9 \
default_value = None if sys.version_info.minor >= 9 \
else f'{PYTHON_THREADPOOL_THREAD_COUNT_DEFAULT}'

max_workers = get_app_setting(setting=PYTHON_THREADPOOL_THREAD_COUNT,
Expand Down
51 changes: 45 additions & 6 deletions tests/unittests/test_dispatcher.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,15 @@

from azure_functions_worker import protos
from azure_functions_worker.constants import (
HTTP_URI,
METADATA_PROPERTIES_WORKER_INDEXED,
PYTHON_ENABLE_DEBUG_LOGGING,
PYTHON_ENABLE_INIT_INDEXING,
PYTHON_THREADPOOL_THREAD_COUNT,
PYTHON_THREADPOOL_THREAD_COUNT_DEFAULT,
PYTHON_THREADPOOL_THREAD_COUNT_MAX_37,
PYTHON_THREADPOOL_THREAD_COUNT_MIN, HTTP_URI, REQUIRES_ROUTE_PARAMETERS,
PYTHON_THREADPOOL_THREAD_COUNT_MIN,
REQUIRES_ROUTE_PARAMETERS
)
from azure_functions_worker.dispatcher import Dispatcher, ContextEnabledTask
from azure_functions_worker.version import VERSION
Expand Down Expand Up @@ -550,15 +552,15 @@ async def test_dispatcher_sync_threadpool_in_placeholder_above_max(self):
"as the default passed is None, the cpu_count determines the "
"number of max_workers and we cannot mock the os.cpu_count() "
"in the concurrent.futures.ThreadPoolExecutor")
class TestThreadPoolSettingsPython39(TestThreadPoolSettingsPython38):
class TestThreadPoolSettingsPython39(TestThreadPoolSettingsPython37):
def setUp(self, version=SysVersionInfo(3, 9, 0, 'final', 0)):
super(TestThreadPoolSettingsPython39, self).setUp(version)

self.mock_os_cpu = patch(
'os.cpu_count', return_value=2)
# 6 - based on 2 cores - min(32, (os.cpu_count() or 1) + 4) - 2 + 4
self._default_workers: Optional[int] = 6
self.mock_os_cpu.start()
self._allowed_max_workers: int = self._over_max_workers

def tearDown(self):
self.mock_os_cpu.stop()
Expand All @@ -570,11 +572,19 @@ def tearDown(self):
"as the default passed is None, the cpu_count determines the "
"number of max_workers and we cannot mock the os.cpu_count() "
"in the concurrent.futures.ThreadPoolExecutor")
class TestThreadPoolSettingsPython310(TestThreadPoolSettingsPython39):
class TestThreadPoolSettingsPython310(TestThreadPoolSettingsPython37):
def setUp(self, version=SysVersionInfo(3, 10, 0, 'final', 0)):
super(TestThreadPoolSettingsPython310, self).setUp(version)
self._allowed_max_workers: int = self._over_max_workers
self.mock_os_cpu = patch(
'os.cpu_count', return_value=2)
# 6 - based on 2 cores - min(32, (os.cpu_count() or 1) + 4) - 2 + 4
self._default_workers: Optional[int] = 6
self.mock_os_cpu.start()
self._allowed_max_workers: int = self._over_max_workers

def tearDown(self):
self.mock_os_cpu.stop()
super(TestThreadPoolSettingsPython310, self).tearDown()


Expand All @@ -583,12 +593,41 @@ def tearDown(self):
"as the default passed is None, the cpu_count determines the "
"number of max_workers and we cannot mock the os.cpu_count() "
"in the concurrent.futures.ThreadPoolExecutor")
class TestThreadPoolSettingsPython311(TestThreadPoolSettingsPython310):
class TestThreadPoolSettingsPython311(TestThreadPoolSettingsPython37):
def setUp(self, version=SysVersionInfo(3, 11, 0, 'final', 0)):
super(TestThreadPoolSettingsPython311, self).setUp(version)
self._allowed_max_workers: int = self._over_max_workers
self.mock_os_cpu = patch(
'os.cpu_count', return_value=2)
# 6 - based on 2 cores - min(32, (os.cpu_count() or 1) + 4) - 2 + 4
self._default_workers: Optional[int] = 6
self.mock_os_cpu.start()
self._allowed_max_workers: int = self._over_max_workers

def tearDown(self):
super(TestThreadPoolSettingsPython310, self).tearDown()
self.mock_os_cpu.stop()
super(TestThreadPoolSettingsPython311, self).tearDown()


@unittest.skipIf(sys.version_info.minor != 12,
"Run the tests only for Python 3.12. In other platforms, "
"as the default passed is None, the cpu_count determines the "
"number of max_workers and we cannot mock the os.cpu_count() "
"in the concurrent.futures.ThreadPoolExecutor")
class TestThreadPoolSettingsPython312(TestThreadPoolSettingsPython37):
def setUp(self, version=SysVersionInfo(3, 12, 0, 'final', 0)):
super(TestThreadPoolSettingsPython312, self).setUp(version)
self._allowed_max_workers: int = self._over_max_workers
self.mock_os_cpu = patch(
'os.cpu_count', return_value=2)
# 6 - based on 2 cores - min(32, (os.cpu_count() or 1) + 4) - 2 + 4
self._default_workers: Optional[int] = 6
self.mock_os_cpu.start()
self._allowed_max_workers: int = self._over_max_workers

def tearDown(self):
self.mock_os_cpu.stop()
super(TestThreadPoolSettingsPython312, self).tearDown()


class TestDispatcherStein(testutils.AsyncTestCase):
Expand Down

0 comments on commit 67bb824

Please sign in to comment.