From eee261685fe9bf1f29d007332da3f82a626562de Mon Sep 17 00:00:00 2001
From: clearml <>
Date: Mon, 3 Mar 2025 19:19:57 +0200
Subject: [PATCH] Fix bash on_abort callback in services mode

---
 clearml_agent/commands/worker.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/clearml_agent/commands/worker.py b/clearml_agent/commands/worker.py
index 98b6533..bf9d5e2 100644
--- a/clearml_agent/commands/worker.py
+++ b/clearml_agent/commands/worker.py
@@ -563,7 +563,6 @@ class TaskStopSignal(object):
         self._bash_callback_timeout = None
         self._bash_callback_thread = None
         self._self_monitor_thread = None
-        self.register_bash_callback()
 
     @classmethod
     def check_registered_bash_callback(cls):
@@ -572,6 +571,8 @@ class TaskStopSignal(object):
                      "").strip())
 
     def register_bash_callback(self):
+        if self._bash_callback:
+            return
         # check if the env variable defined a callback
         if not (ENV_ABORT_CALLBACK_CMD.get() or "").strip():
             return
@@ -604,6 +605,8 @@ class TaskStopSignal(object):
             self._bash_callback_timeout, self._bash_callback))
 
     def start_monitor_thread(self, polling_interval_sec=10):
+        self.register_bash_callback()
+
         if self._self_monitor_thread:
            return
         self._self_monitor_thread = Thread(target=self._monitor_thread_loop, args=(polling_interval_sec, ))