From fa8a14385ac5ef67c2f8c9c6d3f3d101d4c7273f Mon Sep 17 00:00:00 2001 From: PawelPlesniak Date: Fri, 17 Jul 2026 18:55:31 +0200 Subject: [PATCH 1/5] Reverting the parsing method of the connectivity service address --- src/drunc/controller/controller.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/drunc/controller/controller.py b/src/drunc/controller/controller.py index de3ac41c2..357db2635 100644 --- a/src/drunc/controller/controller.py +++ b/src/drunc/controller/controller.py @@ -135,7 +135,8 @@ def __init__(self, configuration, name: str, session: str, token: Token): connection_server_host = ( self.configuration.session.connectivity_service.host ) - connection_port = os.getenv("CONNECTION_PORT") + # connection_port = os.getenv("CONNECTION_PORT") + connection_server_port = self.configuration.session.connectivity_service.port if connection_server_host == "localhost": injected_hostname = os.getenv("DRUNC_HOST_NAME") if not injected_hostname: From 86de8d2d5088e48581b8a9f0917f5e08f101ea7d Mon Sep 17 00:00:00 2001 From: PawelPlesniak Date: Fri, 17 Jul 2026 19:20:06 +0200 Subject: [PATCH 2/5] Typo fix, and unsetting the DISPLAY env var from the SSH config --- src/drunc/controller/controller.py | 2 +- src/drunc/process_manager/process_manager_driver.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/drunc/controller/controller.py b/src/drunc/controller/controller.py index 357db2635..990a0e86d 100644 --- a/src/drunc/controller/controller.py +++ b/src/drunc/controller/controller.py @@ -136,7 +136,7 @@ def __init__(self, configuration, name: str, session: str, token: Token): self.configuration.session.connectivity_service.host ) # connection_port = os.getenv("CONNECTION_PORT") - connection_server_port = self.configuration.session.connectivity_service.port + connection_port = self.configuration.session.connectivity_service.service.port if connection_server_host == "localhost": injected_hostname = os.getenv("DRUNC_HOST_NAME") if not injected_hostname: diff --git a/src/drunc/process_manager/process_manager_driver.py b/src/drunc/process_manager/process_manager_driver.py index 48c37b1c9..3bae291e3 100644 --- a/src/drunc/process_manager/process_manager_driver.py +++ b/src/drunc/process_manager/process_manager_driver.py @@ -322,6 +322,9 @@ def _build_boot_request( data_path = app.get("data_path") env["DUNE_DAQ_BASE_RELEASE"] = os.getenv("DUNE_DAQ_BASE_RELEASE") env["SPACK_RELEASES_DIR"] = os.getenv("SPACK_RELEASES_DIR") + # Some edge cases throw issues with DISPLAY being set, so we remove it from the + # environment + env.pop('DISPLAY', None) tree_id = app["tree_id"] # The following line is required to provide an independent method of injecting From b04535460157d5493f1ee177279240d702ecdb61 Mon Sep 17 00:00:00 2001 From: PawelPlesniak Date: Mon, 20 Jul 2026 15:34:49 +0200 Subject: [PATCH 3/5] RTE script does not need reformatting, but may need it for superuser use --- src/drunc/processes/ssh_process_lifetime_manager_shell.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/drunc/processes/ssh_process_lifetime_manager_shell.py b/src/drunc/processes/ssh_process_lifetime_manager_shell.py index 1d53203dc..1356c0fb6 100644 --- a/src/drunc/processes/ssh_process_lifetime_manager_shell.py +++ b/src/drunc/processes/ssh_process_lifetime_manager_shell.py @@ -442,10 +442,7 @@ def start_process(self, uuid: str, boot_request: BootRequest) -> None: for exe_arg in boot_request.process_description.executable_and_arguments: cmd += exe_arg.exec for arg in exe_arg.args: - if arg.endswith("daq_app_rte.sh"): - cmd += f" {os.getenv('DBT_AREA_ROOT')}/install/daq_app_rte.sh" - else: - cmd += f" {arg}" + cmd += f" {arg}" cmd += ";" # Remove trailing semicolon if present From 36708ccd49d11f23022724e9149544c88693be75 Mon Sep 17 00:00:00 2001 From: PawelPlesniak Date: Mon, 20 Jul 2026 16:44:48 +0200 Subject: [PATCH 4/5] Rollback --- src/drunc/controller/controller.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/drunc/controller/controller.py b/src/drunc/controller/controller.py index 990a0e86d..cda04444d 100644 --- a/src/drunc/controller/controller.py +++ b/src/drunc/controller/controller.py @@ -135,8 +135,8 @@ def __init__(self, configuration, name: str, session: str, token: Token): connection_server_host = ( self.configuration.session.connectivity_service.host ) - # connection_port = os.getenv("CONNECTION_PORT") - connection_port = self.configuration.session.connectivity_service.service.port + connection_port = os.getenv("CONNECTION_PORT") + if connection_server_host == "localhost": injected_hostname = os.getenv("DRUNC_HOST_NAME") if not injected_hostname: From ac840a039de77efbe1c0bb99e3adc65e7b3c7bc3 Mon Sep 17 00:00:00 2001 From: PawelPlesniak Date: Mon, 20 Jul 2026 16:46:01 +0200 Subject: [PATCH 5/5] Bump --- src/drunc/controller/controller.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/drunc/controller/controller.py b/src/drunc/controller/controller.py index cda04444d..de3ac41c2 100644 --- a/src/drunc/controller/controller.py +++ b/src/drunc/controller/controller.py @@ -136,7 +136,6 @@ def __init__(self, configuration, name: str, session: str, token: Token): self.configuration.session.connectivity_service.host ) connection_port = os.getenv("CONNECTION_PORT") - if connection_server_host == "localhost": injected_hostname = os.getenv("DRUNC_HOST_NAME") if not injected_hostname: