From d3049246ab3a8b13ac803bf579f69f0ab688de21 Mon Sep 17 00:00:00 2001
From: Robert Rosca <robert.rosca@xfel.eu>
Date: Fri, 13 May 2022 10:46:06 +0200
Subject: [PATCH] Return None if resolved path parents not for known repository
---
webservice/webservice.py | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/webservice/webservice.py b/webservice/webservice.py
index 221832d3a..cd850d14c 100644
--- a/webservice/webservice.py
+++ b/webservice/webservice.py
@@ -530,7 +530,7 @@ async def wait_on_transfer(
run_dir: Path,
max_tries: int = 300,
sleep_completion: int = 10,
-) -> List[str]:
+) -> Optional[List[str]]:
"""Query MyMDC to get run migration status.
This coro queries MyMDC to get the storage spaces where the data is
@@ -594,13 +594,14 @@ async def wait_on_transfer(
required_repository = "XFEL_GPFS_OFFLINE"
else:
logging.warning(
- f"Proposal {proposal} run {run} resolved path is not relative to"
- f"`/pnfs/xfel.eu/exfel` or `/gpfs/exfel/d`: {run_dir}"
+ f"Proposal {proposal} run {run} resolved path is not relative "
+ f"to `/pnfs/xfel.eu/exfel` or `/gpfs/exfel/d`: {run_dir=}"
)
+ return
logging.debug(f"{required_repository=}")
- if required_repositoryis not None and any(required_repository in r for r in repositories):
+ if any(required_repository in r for r in repositories):
return repositories
logging.info(
--
GitLab