Merge pull request #30116 from def-/pr-grace

mzcompose: Higher stop grace periods for materialized/clusterd

misc/python/materialize/mzcompose/service.py

@@ -168,6 +168,9 @@ class ServiceConfig(TypedDict, total=False):
     publish: bool | None
     """Override whether an image is publishable. Unpublishable images can be built during normal test runs in CI."""
 
+    stop_grace_period: str | None
+    """Time to wait when stopping a container."""
+
 
 class Service:
     """A Docker Compose service in a `Composition`.

misc/python/materialize/mzcompose/services/clusterd.py

@@ -25,6 +25,7 @@ def __init__(
         memory: str | None = None,
         options: list[str] = [],
         restart: str = "no",
+        stop_grace_period: str = "60s",
     ) -> None:
         environment = [
             "CLUSTERD_LOG_FILTER",
@@ -60,6 +61,7 @@ def __init__(
                 "environment": environment,
                 "volumes": DEFAULT_MZ_VOLUMES,
                 "restart": restart,
+                "stop_grace_period": stop_grace_period,
             }
         )
 

misc/python/materialize/mzcompose/services/materialized.py

@@ -59,6 +59,7 @@ def __init__(
         deploy_generation: int | None = None,
         force_migrations: str | None = None,
         publish: bool | None = None,
+        stop_grace_period: str = "60s",
     ) -> None:
         if name is None:
             name = "materialized"
@@ -260,6 +261,7 @@ def __init__(
                     # A fully loaded Materialize can take a long time to start.
                     "start_period": "600s",
                 },
+                "stop_grace_period": stop_grace_period,
             }
         )