fix merge

modal-labs · Aug 30, 2024 · b48a0d0 · b48a0d0
1 parent 67bafd1
commit b48a0d0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/modal/_container_entrypoint.py b/modal/_container_entrypoint.py
@@ -246,7 +246,7 @@ def worker_thread():
                     logger.exception(f"Exception raised by {_func} in DaemonizedThreadPool worker!")
                 self.inputs.task_done()
 
-        if self.spawned_workers < self.container_io_manager.get_input_concurrency():
+        if self.spawned_workers < self.max_threads:
             threading.Thread(target=worker_thread, daemon=True).start()
             self.spawned_workers += 1
 

diff --git a/modal/_container_io_manager.py b/modal/_container_io_manager.py
@@ -420,6 +420,7 @@ async def _dynamic_concurrency_loop(self):
 
             except Exception as exc:
                 logger.debug(f"Failed to get dynamic concurrency for task {self.task_id}, {exc}")
+
             await asyncio.sleep(DYNAMIC_CONCURRENCY_INTERVAL_SECS)
 
     async def get_app_objects(self) -> RunningApp:

diff --git a/modal/app.py b/modal/app.py
@@ -557,7 +557,7 @@ def function(
         allow_concurrent_inputs: Optional[int] = None,  # Maximum number of inputs the container may fetch concurrently.
         target_concurrent_inputs: Optional[
             int
-        ] = None,  # .# Desired input concurrency for autoscaling. Must be <= allow_concurrent_inputs.
+        ] = None,  # Desired input concurrency for autoscaling. Must be <= allow_concurrent_inputs.
         container_idle_timeout: Optional[int] = None,  # Timeout for idle containers waiting for inputs to shut down.
         timeout: Optional[int] = None,  # Maximum execution time of the function in seconds.
         keep_warm: Optional[
@@ -763,7 +763,7 @@ def cls(
         allow_concurrent_inputs: Optional[int] = None,  # Maximum number of inputs the container may fetch concurrently.
         target_concurrent_inputs: Optional[
             int
-        ] = None,  # .# Desired input concurrency for autoscaling. Must be <= allow_concurrent_inputs.
+        ] = None,  # Desired input concurrency for autoscaling. Must be <= allow_concurrent_inputs.
         container_idle_timeout: Optional[int] = None,  # Timeout for idle containers waiting for inputs to shut down.
         timeout: Optional[int] = None,  # Maximum execution time of the function in seconds.
         keep_warm: Optional[int] = None,  # An optional number of containers to always keep warm.