Skip to content

Commit 4e3e6b5

Browse files
Usage Tracking: Only log messages when tracking is enabled (#3748)
Fix the bug where the DFK logs that it is entering usage tracking code in a way that suggests it is logging usage tracking data, even when turned off. # Changed Behaviour The DFK will only log messages about usage tracking data being sent when usage tracking is enabled. # Fixes Fixes #3740 ## Type of change - Bug fix --------- Co-authored-by: Ben Clifford <[email protected]>
1 parent 6ac930e commit 4e3e6b5

File tree

2 files changed

+13
-10
lines changed

2 files changed

+13
-10
lines changed

parsl/dataflow/dflow.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1200,10 +1200,8 @@ def cleanup(self) -> None:
12001200
self._checkpoint_timer.close()
12011201

12021202
# Send final stats
1203-
logger.info("Sending end message for usage tracking")
12041203
self.usage_tracker.send_end_message()
12051204
self.usage_tracker.close()
1206-
logger.info("Closed usage tracking")
12071205

12081206
logger.info("Closing job status poller")
12091207
self.job_status_poller.close()

parsl/usage_tracking/usage.py

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -213,12 +213,14 @@ def send_UDP_message(self, message: bytes) -> None:
213213

214214
def send_start_message(self) -> None:
215215
if self.tracking_level:
216+
logger.info("Sending start message for usage tracking")
216217
self.start_time = time.time()
217218
message = self.construct_start_message()
218219
self.send_UDP_message(message)
219220

220221
def send_end_message(self) -> None:
221222
if self.tracking_level == 3:
223+
logger.info("Sending end message for usage tracking")
222224
message = self.construct_end_message()
223225
self.send_UDP_message(message)
224226

@@ -229,11 +231,14 @@ def close(self, timeout: float = 10.0) -> None:
229231
definitely either: going to behave broadly the same as to SIGKILL,
230232
or won't respond to SIGTERM.
231233
"""
232-
for proc in self.procs:
233-
logger.debug("Joining usage tracking process %s", proc)
234-
proc.join(timeout=timeout)
235-
if proc.is_alive():
236-
logger.warning("Usage tracking process did not end itself; sending SIGKILL")
237-
proc.kill()
238-
239-
proc.close()
234+
if self.tracking_level:
235+
logger.info("Closing usage tracking")
236+
237+
for proc in self.procs:
238+
logger.debug("Joining usage tracking process %s", proc)
239+
proc.join(timeout=timeout)
240+
if proc.is_alive():
241+
logger.warning("Usage tracking process did not end itself; sending SIGKILL")
242+
proc.kill()
243+
244+
proc.close()

0 commit comments

Comments
 (0)