From 6e7fb5f3313c61a01dcbce9c80abddc41c9e5808 Mon Sep 17 00:00:00 2001
From: allegroai <>
Date: Mon, 5 Dec 2022 11:19:14 +0200
Subject: [PATCH] Fix sending task logs fails when agent is not running in the
 same tenant

---
 clearml_agent/commands/worker.py |  4 ----
 clearml_agent/glue/k8s.py        | 18 ++++++++++--------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/clearml_agent/commands/worker.py b/clearml_agent/commands/worker.py
index 548b3a8..3289c83 100644
--- a/clearml_agent/commands/worker.py
+++ b/clearml_agent/commands/worker.py
@@ -3798,7 +3798,6 @@ class Worker(ServiceCommandSection):
         except:
             pass
 
-        agent_install_bash_script = []
         if os.environ.get('FORCE_LOCAL_CLEARML_AGENT_WHEEL'):
             local_wheel = os.path.expanduser(os.environ.get('FORCE_LOCAL_CLEARML_AGENT_WHEEL'))
             docker_wheel = '/tmp/{}'.format(basename(local_wheel))
@@ -3839,9 +3838,6 @@ class Worker(ServiceCommandSection):
             if preprocess_bash_script:
                 bash_script = preprocess_bash_script + bash_script
 
-            if agent_install_bash_script:
-                bash_script += agent_install_bash_script
-
             docker_bash_script = " ; ".join([line for line in bash_script if line]) \
                 if not isinstance(bash_script, str) else bash_script
 
diff --git a/clearml_agent/glue/k8s.py b/clearml_agent/glue/k8s.py
index b08a6bc..79e09bd 100644
--- a/clearml_agent/glue/k8s.py
+++ b/clearml_agent/glue/k8s.py
@@ -816,14 +816,6 @@ class K8sIntegration(Worker):
                     except (KeyError, TypeError, AttributeError):
                         print("No tasks in queue {}".format(queue))
                         continue
-                    events_service.send_log_events(
-                        self.worker_id,
-                        task_id=task_id,
-                        lines="task {} pulled from {} by worker {}".format(
-                            task_id, queue, self.worker_id
-                        ),
-                        level="INFO",
-                    )
 
                     task_session = None
                     if self._impersonate_as_task_owner:
@@ -843,6 +835,16 @@ class K8sIntegration(Worker):
                             )
                             continue
 
+                    events_service.send_log_events(
+                        self.worker_id,
+                        task_id=task_id,
+                        lines="task {} pulled from {} by worker {}".format(
+                            task_id, queue, self.worker_id
+                        ),
+                        level="INFO",
+                        session=task_session,
+                    )
+
                     self.report_monitor(ResourceMonitor.StatusReport(queues=queues, queue=queue, task=task_id))
                     self.run_one_task(queue, task_id, worker_params, task_session)
                     self.report_monitor(ResourceMonitor.StatusReport(queues=self.queues))