Merge pull request #85 from lsst-sqre/tickets/DM-51350

tickets/DM-51350: use homedir schema in scratch path

Author: athornton

changelog.d/20250611_153630_athornton_DM_51350.md

@@ -0,0 +1,9 @@
+<!-- Delete the sections that don't apply -->
+
+### New features
+
+- Detect HOMEDIR_SCHEMA for scratch-path calculation
+
+### Bug fixes
+
+- If writing token or increasing log depth fails, continue but warn user on startup

src/lsst/rsp/startup/services/labrunner/labrunner.py

@@ -195,7 +195,12 @@ def _check_user_scratch_subdir(self, path: Path) -> Path | None:
         if not user:
             self._logger.warning("Could not determine user from environment")
             return None
+        schema = self._env.get("HOMEDIR_SCHEMA", "username")
         user_scratch_path = scratch_path / user / path
+        # This is pretty ad-hoc, but USDF uses the first letter in the
+        # username for both home and scratch
+        if schema == "initialThenUsername":
+            user_scratch_path = scratch_path / user[0] / user / path
         try:
             user_scratch_path.mkdir(parents=True, exist_ok=True, mode=0o700)
         except OSError as exc:
@@ -651,8 +656,13 @@ def _launch(self) -> None:
 
     def _modify_interactive_settings(self) -> None:
         self._logger.debug("Modifying interactive settings if needed")
-        self._manage_access_token()
-        self._increase_log_limit()
+        # These both write files; if either fails, start up but warn
+        # the user their experience is likely to be bad.
+        try:
+            self._manage_access_token()
+            self._increase_log_limit()
+        except OSError as exc:
+            self._set_abnormal_startup(exc)
 
     def _increase_log_limit(self) -> None:
         self._logger.debug("Increasing log limit if needed")