🐛♻️ adding meaningful restart policy for services (#3262)

Co-authored-by: Andrei Neagu <[email protected]>
ITISFoundation · Aug 22, 2022 · 8443c68 · 8443c68
1 parent 25e7ca9
commit 8443c68
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/...rc/simcore_service_director_v2/modules/dynamic_sidecar/docker_service_specs/_constants.py b/...rc/simcore_service_director_v2/modules/dynamic_sidecar/docker_service_specs/_constants.py
@@ -0,0 +1,9 @@
+from typing import Final
+
+_SECOND: Final[int] = 1_000_000_000  # expressed in nano-seconds
+
+DOCKER_CONTAINER_SPEC_RESTART_POLICY_DEFAULTS = {
+    "Condition": "on-failure",
+    "MaxAttempts": 0,
+    "Delay": 5 * _SECOND,
+}
diff --git a/...-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/docker_service_specs/proxy.py b/...-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/docker_service_specs/proxy.py
@@ -10,6 +10,7 @@
 
 from ....core.settings import DynamicSidecarProxySettings, DynamicSidecarSettings
 from ....models.schemas.dynamic_services import SchedulerData, ServiceType
+from ._constants import DOCKER_CONTAINER_SPEC_RESTART_POLICY_DEFAULTS
 
 
 def get_dynamic_proxy_spec(
@@ -107,10 +108,6 @@ def get_dynamic_proxy_spec(
                 },
                 "Limits": {"MemoryBytes": MEMORY_250MB, "NanoCPUs": CPU_100_PERCENT},
             },
-            "RestartPolicy": {
-                "Condition": "on-failure",
-                "Delay": 5000000,
-                "MaxAttempts": 100,
-            },
+            "RestartPolicy": DOCKER_CONTAINER_SPEC_RESTART_POLICY_DEFAULTS,
         },
     }
diff --git a/...2/src/simcore_service_director_v2/modules/dynamic_sidecar/docker_service_specs/sidecar.py b/...2/src/simcore_service_director_v2/modules/dynamic_sidecar/docker_service_specs/sidecar.py
@@ -12,6 +12,7 @@
 from ....models.schemas.dynamic_services import SchedulerData, ServiceType
 from .._namespace import get_compose_namespace
 from ..volumes import DynamicSidecarVolumesPathsResolver
+from ._constants import DOCKER_CONTAINER_SPEC_RESTART_POLICY_DEFAULTS
 from .settings import update_service_params_from_settings
 
 log = logging.getLogger(__name__)
@@ -253,11 +254,7 @@ def get_dynamic_sidecar_spec(
                     app_settings.DIRECTOR_V2_SERVICES_CUSTOM_CONSTRAINTS
                 )
             },
-            "RestartPolicy": {
-                "Condition": "on-failure",
-                "Delay": 5000000,
-                "MaxAttempts": 2,
-            },
+            "RestartPolicy": DOCKER_CONTAINER_SPEC_RESTART_POLICY_DEFAULTS,
             # this will get overwritten
             "Resources": {
                 "Limits": {"NanoCPUs": 0, "MemoryBytes": 0},

diff --git a/services/director-v2/tests/unit/test_modules_dynamic_sidecar_docker_service_specs.py b/services/director-v2/tests/unit/test_modules_dynamic_sidecar_docker_service_specs.py
@@ -339,8 +339,8 @@ def expected_dynamic_sidecar_spec(run_id: RunID) -> dict[str, Any]:
             },
             "RestartPolicy": {
                 "Condition": "on-failure",
-                "Delay": 5000000,
-                "MaxAttempts": 2,
+                "Delay": 5000000000,
+                "MaxAttempts": 0,
             },
         },
     }