Merge pull request #238 from lsst-sqre/tickets/DM-38425

DM-38425: Revert error_idle_time change from 5.0.0
lsst-sqre · May 4, 2023 · 0f7362d · 0f7362d
2 parents 5837c0f + 8ea4fff
commit 0f7362d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/changelog.d/20230504_132825_rra_DM_38425.md b/changelog.d/20230504_132825_rra_DM_38425.md
@@ -0,0 +1,3 @@
+### Other changes
+
+- The default `error_idle_time` for Nublado-based business is back to 60 seconds instead of 10 minutes. The problem the longer timeout was working around should be fixed in the new Nublado lab controller.
diff --git a/src/mobu/models/business/nublado.py b/src/mobu/models/business/nublado.py
@@ -133,17 +133,6 @@ class NubladoBusinessOptions(BusinessOptions):
         60, title="Timeout for deleting a lab in seconds", example=60
     )
 
-    # Zero-to-JupyterHub forces the spawner timeout to 10 minutes, and this is
-    # not unreasonable if the user is trying to spawn an image that isn't
-    # prepulled. Since JupyterHub won't let us delete a lab while it's waiting
-    # for spawn, increase the error idle time to long enough that JupyterHub
-    # will have timed out.
-    error_idle_time: int = Field(
-        600,
-        title="How long to wait after an error before restarting",
-        example=600,
-    )
-
     execution_idle_time: int = Field(
         1,
         title="How long to wait between cell executions in seconds",