Skip to content

Commit 92a4574

Browse files
committed
remove download records associated with job on job delete
1 parent a723337 commit 92a4574

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

jupyter_scheduler/extension.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ def initialize_settings(self):
8181
root_dir=self.serverapp.root_dir,
8282
environments_manager=environments_manager,
8383
db_url=self.db_url,
84-
download_queue=download_manager.queue,
84+
download_manager=download_manager,
8585
config=self.config,
8686
)
8787

jupyter_scheduler/scheduler.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
from traitlets import Unicode, default
1616
from traitlets.config import LoggingConfigurable
1717

18+
from jupyter_scheduler.download_manager import DownloadManager
1819
from jupyter_scheduler.environments import EnvironmentManager
1920
from jupyter_scheduler.exceptions import (
2021
IdempotencyTokenError,
@@ -404,7 +405,7 @@ def __init__(
404405
root_dir: str,
405406
environments_manager: Type[EnvironmentManager],
406407
db_url: str,
407-
download_queue: mp.Queue,
408+
download_manager: DownloadManager,
408409
config=None,
409410
**kwargs,
410411
):
@@ -414,7 +415,7 @@ def __init__(
414415
self.db_url = db_url
415416
if self.task_runner_class:
416417
self.task_runner = self.task_runner_class(scheduler=self, config=config)
417-
self.download_queue = download_queue
418+
self.download_manager = download_manager
418419

419420
@property
420421
def db_session(self):
@@ -494,7 +495,7 @@ def create_job(self, model: CreateJob) -> str:
494495
staging_paths=staging_paths,
495496
root_dir=self.root_dir,
496497
db_url=self.db_url,
497-
download_queue=self.download_queue,
498+
download_queue=self.download_manager.queue,
498499
).process
499500
)
500501
p.start()
@@ -586,6 +587,7 @@ def delete_job(self, job_id: str):
586587

587588
session.query(Job).filter(Job.job_id == job_id).delete()
588589
session.commit()
590+
self.download_manager.delete_job_downloads(job_id)
589591

590592
def stop_job(self, job_id):
591593
with self.db_session() as session:

0 commit comments

Comments
 (0)