Skip to content

Commit cc2584d

Browse files
authored
Less verbose log messages for remove and register worker (#8938)
1 parent d7eff77 commit cc2584d

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

distributed/scheduler.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4571,7 +4571,7 @@ async def add_worker(
45714571
)
45724572
self.stimulus_queue_slots_maybe_opened(stimulus_id=stimulus_id)
45734573

4574-
logger.info("Register worker %s", ws)
4574+
logger.info("Register worker addr: %s name: %s", ws.address, ws.name)
45754575

45764576
msg = {
45774577
"status": "OK",
@@ -5428,7 +5428,9 @@ async def remove_worker(
54285428

54295429
ws = self.workers[address]
54305430

5431-
logger.info(f"Remove worker {ws} ({stimulus_id=})")
5431+
logger.info(
5432+
f"Remove worker addr: {ws.address} name: {ws.name} ({stimulus_id=})"
5433+
)
54325434
if close:
54335435
with suppress(AttributeError, CommClosedError):
54345436
self.stream_comms[address].send(
@@ -7548,7 +7550,11 @@ async def retire_workers(
75487550
names_set = {str(name) for name in names}
75497551
wss = {ws for ws in self.workers.values() if str(ws.name) in names_set}
75507552
elif workers is not None:
7551-
logger.info("Retire worker addresses %s", workers)
7553+
logger.info(
7554+
"Retire worker addresses (stimulus_id='%s') %s",
7555+
stimulus_id,
7556+
workers,
7557+
)
75527558
wss = {
75537559
self.workers[address]
75547560
for address in workers
@@ -7572,8 +7578,6 @@ async def retire_workers(
75727578
try:
75737579
coros = []
75747580
for ws in wss:
7575-
logger.info(f"Retiring worker {ws.address!r} ({stimulus_id=!r})")
7576-
75777581
policy = RetireWorker(ws.address)
75787582
amm.add_policy(policy)
75797583

distributed/tests/test_worker.py

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2985,19 +2985,15 @@ async def test_log_remove_worker(c, s, a, b):
29852985

29862986
assert log.getvalue().splitlines() == [
29872987
# Successful graceful
2988-
f"Retire worker addresses ['{a.address}']",
2989-
f"Retiring worker '{a.address}' (stimulus_id='graceful')",
2990-
f"Remove worker <WorkerState '{a.address}', name: 0, status: "
2991-
"closing_gracefully, memory: 2, processing: 1> (stimulus_id='graceful')",
2988+
f"Retire worker addresses (stimulus_id='graceful') ['{a.address}']",
2989+
f"Remove worker addr: {a.address} name: {a.name} (stimulus_id='graceful')",
29922990
f"Retired worker '{a.address}' (stimulus_id='graceful')",
29932991
# Aborted graceful
2994-
f"Retire worker addresses ['{b.address}']",
2995-
f"Retiring worker '{b.address}' (stimulus_id='graceful_abort')",
2992+
f"Retire worker addresses (stimulus_id='graceful_abort') ['{b.address}']",
29962993
f"Could not retire worker '{b.address}': unique data could not be "
29972994
"moved to any other worker (stimulus_id='graceful_abort')",
29982995
# Ungraceful
2999-
f"Remove worker <WorkerState '{b.address}', name: 1, status: "
3000-
"running, memory: 2, processing: 1> (stimulus_id='ungraceful')",
2996+
f"Remove worker addr: {b.address} name: {b.name} (stimulus_id='ungraceful')",
30012997
f"Removing worker '{b.address}' caused the cluster to lose already "
30022998
"computed task(s), which will be recomputed elsewhere: {'x'} "
30032999
"(stimulus_id='ungraceful')",

0 commit comments

Comments
 (0)