add healthcheck wait condition and parallelize starting of containers

getsentry · Dec 10, 2024 · a899549 · a899549
1 parent ade1b03
commit a899549
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/devservices/commands/up.py b/devservices/commands/up.py
@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import concurrent.futures
 import os
 import subprocess
 from argparse import _SubParsersAction
@@ -128,7 +129,7 @@ def _up(
     current_env[
         DEVSERVICES_DEPENDENCIES_CACHE_DIR_KEY
     ] = relative_local_dependency_directory
-    options = ["-d"]
+    options = ["-d", "--wait"]
     dependency_graph = construct_dependency_graph(service, modes=modes)
     starting_order = dependency_graph.get_starting_order()
     sorted_remote_dependencies = sorted(
@@ -144,8 +145,16 @@ def _up(
         mode_dependencies=mode_dependencies,
     )
 
-    for cmd in docker_compose_commands:
-        _bring_up_dependency(cmd, current_env, status, len(options))
+    cmd_outputs = []
+    with concurrent.futures.ThreadPoolExecutor() as executor:
+        futures = [
+            executor.submit(
+                _bring_up_dependency, cmd, current_env, status, len(options)
+            )
+            for cmd in docker_compose_commands
+        ]
+        for future in concurrent.futures.as_completed(futures):
+            cmd_outputs.append(future.result())
 
 
 def _create_devservices_network() -> None:

diff --git a/tests/commands/test_up.py b/tests/commands/test_up.py
@@ -90,6 +90,7 @@ def test_up_simple(
                 "clickhouse",
                 "redis",
                 "-d",
+                "--wait",
             ],
             check=True,
             capture_output=True,
@@ -288,6 +289,7 @@ def test_up_mode_simple(
                 "up",
                 "redis",
                 "-d",
+                "--wait",
             ],
             check=True,
             capture_output=True,
@@ -426,6 +428,7 @@ def test_up_mutliple_modes(
                         "up",
                         "redis",
                         "-d",
+                        "--wait",
                     ],
                     check=True,
                     capture_output=True,
@@ -553,6 +556,7 @@ def test_up_multiple_modes_overlapping_running_service(
                             "up",
                             "clickhouse",
                             "-d",
+                            "--wait",
                         ],
                         mock.ANY,
                     ),