Merge branch 'develop' into feat/3564-svc-git-url

SwissDataScienceCenter · Nov 13, 2023 · 4ca51e1 · 4ca51e1
2 parents 89cbce9 + 4726f66
commit 4ca51e1
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 3 deletions.
diff --git a/LICENSE b/LICENSE
@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2019-2023 - Swiss Data Science Center
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/renku/core/session/docker.py b/renku/core/session/docker.py
@@ -356,6 +356,9 @@ def session_start_helper(consider_disk_request: bool):
                     environment["CHOWN_HOME"] = "yes"
                     environment["CHOWN_HOME_OPTS"] = "-R"
 
+                if "force_build" in kwargs:
+                    del kwargs["force_build"]
+
                 container = self.docker_client().containers.run(
                     image_name,
                     'jupyter notebook --NotebookApp.ip="0.0.0.0"'

diff --git a/renku/core/session/session.py b/renku/core/session/session.py
@@ -242,10 +242,16 @@ def stop_sessions(session_provider: ISessionProvider) -> SessionStopStatus:
             return session_provider.session_stop(
                 project_name=project_name, session_name=session_name, stop_all=stop_all
             )
-        except errors.RenkulabSessionGetUrlError:
+        except errors.RenkulabSessionGetUrlError as e:
             if provider:
                 raise
-            return SessionStopStatus.FAILED
+            communication.warn(f"Didn't stop any renkulab sessions: {e}")
+            return SessionStopStatus.SUCCESSFUL
+        except errors.DockerError as e:
+            if provider:
+                raise
+            communication.warn(f"Didn't stop any docker sessions: {e}")
+            return SessionStopStatus.SUCCESSFUL
 
     session_detail = "all sessions" if stop_all else f"session {session_name}" if session_name else "session"
     project_name = get_renku_project_name()

diff --git a/renku/ui/service/controllers/datasets_add_file.py b/renku/ui/service/controllers/datasets_add_file.py
@@ -80,6 +80,8 @@ def prepare_paths(self):
                         _file["file_url"],
                         job_timeout=int(os.getenv("WORKER_DATASET_JOBS_TIMEOUT", 1800)),
                         result_ttl=int(os.getenv("WORKER_DATASET_JOBS_RESULT_TTL", 500)),
+                        ttl=int(os.getenv("WORKER_DATASET_JOBS_TIMEOUT", 1800)),
+                        failure_ttl=int(os.getenv("WORKER_DATASET_JOBS_RESULT_TTL", 500)),
                     )
                     enqueued_paths.append(_file["file_url"])
 

diff --git a/renku/ui/service/controllers/datasets_import.py b/renku/ui/service/controllers/datasets_import.py
@@ -65,6 +65,8 @@ def renku_op(self):
                 tag=self.ctx.get("tag", None),
                 job_timeout=int(os.getenv("WORKER_DATASET_JOBS_TIMEOUT", 1800)),
                 result_ttl=int(os.getenv("WORKER_DATASET_JOBS_RESULT_TTL", 500)),
+                ttl=int(os.getenv("WORKER_DATASET_JOBS_TIMEOUT", 1800)),
+                failure_ttl=int(os.getenv("WORKER_DATASET_JOBS_RESULT_TTL", 500)),
                 commit_message=self.ctx["commit_message"],
                 data_directory=self.ctx.get("data_directory"),
             )