fix!: Terminating all VFS processes when cleaning up session (#149)

* fix!: Terminating all VFS processes when cleaning up session
---------

Signed-off-by: Nathan Matthews <natmatn@amazon.com>

pyproject.toml

@@ -8,7 +8,7 @@ dynamic = ["version"]
 dependencies = [
     "requests ~= 2.31",
     "boto3 >= 1.28.80",
-    "deadline == 0.37.*",
+    "deadline == 0.38.*",
     "openjd-sessions == 0.5.*",
     # tomli became tomllib in standard library in Python 3.11
     "tomli == 2.0.* ; python_version<'3.11'",

src/deadline_worker_agent/sessions/session.py

@@ -374,6 +374,12 @@ def _cleanup(self) -> None:
                     logger.info("%s successful", desc)
                 cur_time = monotonic()
         finally:
+            if self._asset_sync is not None and self._job_attachment_details is not None:
+                # terminate any running virtual file systems
+                self._asset_sync.cleanup_session(
+                    session_dir=self._session.working_directory,
+                    file_system=self._job_attachment_details.job_attachments_file_system,
+                )
             # Clean-up the Open Job Description session
             self._session.cleanup()
 

test/unit/sessions/test_session.py

@@ -1663,6 +1663,31 @@ def test_calls_openjd_cleanup(
         # THEN
         openjd_session_cleanup.assert_called_once_with()
 
+    @pytest.fixture()
+    def mock_asset_sync(self, session: Session) -> Generator[MagicMock, None, None]:
+        with patch.object(session, "_asset_sync") as mock_asset_sync:
+            yield mock_asset_sync
+
+    def test_calls_asset_sync_cleanup(
+        self,
+        session: Session,
+        job_attachment_details: JobAttachmentDetails,
+        mock_asset_sync: MagicMock,
+        mock_openjd_session: MagicMock,
+    ) -> None:
+        # GIVEN
+        mock_asset_sync_cleanup: MagicMock = mock_asset_sync.cleanup_session
+        session._job_attachment_details = job_attachment_details
+
+        # WHEN
+        session._cleanup()
+
+        # THEN
+        mock_asset_sync_cleanup.assert_called_once_with(
+            session_dir=mock_openjd_session.working_directory,
+            file_system=job_attachment_details.job_attachments_file_system,
+        )
+
 
 class TestSessionStartAction:
     """Tests for Session._start_action()"""