From 8bdc8cfed2310c8306abbd0558f2dc5aba36830c Mon Sep 17 00:00:00 2001
From: Ben Clifford <benc@hawaga.org.uk>
Date: Fri, 1 Nov 2024 11:40:41 +0000
Subject: [PATCH] Worker does not need a remote logdir any more - it is always
 local, and per-component logdir configurability should not be a Parsl feature
 - if this is something people really want, we should push on providing
 user-configurable logging in the worker

---
 parsl/executors/high_throughput/executor.py | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/parsl/executors/high_throughput/executor.py b/parsl/executors/high_throughput/executor.py
index a1def0466a..a6536e3120 100644
--- a/parsl/executors/high_throughput/executor.py
+++ b/parsl/executors/high_throughput/executor.py
@@ -140,9 +140,6 @@
         period for the batch job to start the workers, minus the expected
         maximum length of an individual task.
 
-    worker_logdir_root : string
-        In case of a remote file system, specify the path to where logs will be kept.
-
     encrypted : bool
         Flag to enable/disable encryption (CurveZMQ). Default is False.
 
@@ -250,7 +247,6 @@ def __init__(self,
                  drain_period: Optional[int] = None,
                  poll_period: int = 10,
                  address_probe_timeout: Optional[int] = None,
-                 worker_logdir_root: Optional[str] = None,
                  manager_selector: ManagerSelector = RandomManagerSelector(),
                  block_error_handler: Union[bool, Callable[[BlockProviderExecutor, Dict[str, JobStatus]], None]] = True,
                  encrypted: bool = False):
@@ -309,7 +305,6 @@ def __init__(self,
         self.drain_period = drain_period
         self.poll_period = poll_period
         self.run_dir = '.'
-        self.worker_logdir_root = worker_logdir_root
         self.cpu_affinity = cpu_affinity
         self.encrypted = encrypted
         self.cert_dir = None
@@ -338,12 +333,6 @@ def _warn_deprecated(self, old: str, new: str):
     def logdir(self):
         return "{}/{}".format(self.run_dir, self.label)
 
-    @property
-    def worker_logdir(self):
-        if self.worker_logdir_root is not None:
-            return "{}/{}".format(self.worker_logdir_root, self.label)
-        return self.logdir
-
     def validate_resource_spec(self, resource_specification: dict):
         """HTEX supports the following *Optional* resource specifications:
         priority: lower value is higher priority"""
@@ -384,7 +373,7 @@ def initialize_scaling(self):
                                        drain_period=self.drain_period,
                                        poll_period=self.poll_period,
                                        cert_dir=self.cert_dir,
-                                       logdir=self.worker_logdir,
+                                       logdir=self.logdir,
                                        cpu_affinity=self.cpu_affinity,
                                        enable_mpi_mode=enable_mpi_opts,
                                        mpi_launcher=self.mpi_launcher,