fix the fix

radical-cybertools · Apr 10, 2024 · 285b223 · 285b223
1 parent b74bed2
commit 285b223
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/radical/pilot/agent/staging_input/default.py b/src/radical/pilot/agent/staging_input/default.py
@@ -181,8 +181,7 @@ def _handle_task(self, task, actionables):
             if action in [rpc.COPY, rpc.LINK, rpc.MOVE]:
                 assert src.schema == 'file', 'staging src expected as file://'
 
-            # backend will take care of dir creation - but we do it manually
-            # for local ops (copy, link, move)
+            # implicitly create target dir if needed - but only for local ops
             if action != rpc.TRANSFER:
                 tgtdir = os.path.dirname(tgt.path)
                 if tgtdir != task_sandbox.path:
@@ -191,7 +190,6 @@ def _handle_task(self, task, actionables):
 
             if action == rpc.COPY:
                 try:
-                    ru.rec_makedir(os.path.dirname(tgt.path))
                     shutil.copytree(src.path, tgt.path)
                 except OSError as exc:
                     if exc.errno == errno.ENOTDIR:

diff --git a/src/radical/pilot/agent/staging_output/default.py b/src/radical/pilot/agent/staging_output/default.py
@@ -317,9 +317,15 @@ def _handle_task_staging(self, task, actionables):
             if action in [rpc.COPY, rpc.LINK, rpc.MOVE]:
                 assert tgt.schema == 'file', 'staging tgt expected as file://'
 
+            # implicitly create target dir if needed - but only for local ops
+            if action != rpc.TRANSFER:
+                tgtdir = os.path.dirname(tgt.path)
+                if tgtdir != task_sandbox.path:
+                    self._log.debug("mkdir %s", tgtdir)
+                    ru.rec_makedir(tgtdir)
+
             if action == rpc.COPY:
                 try:
-                    ru.rec_makedir(os.path.dirname(tgt.path))
                     shutil.copytree(src.path, tgt.path)
                 except OSError as exc:
                     if exc.errno == errno.ENOTDIR: