From ad0256006bc7d5018277da0d6c686224ffaaa8fe Mon Sep 17 00:00:00 2001 From: Joseph Hamman Date: Wed, 8 Aug 2018 11:36:28 -0600 Subject: [PATCH 1/3] avoid returning coroutines in scale --- distributed/deploy/cluster.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/distributed/deploy/cluster.py b/distributed/deploy/cluster.py index 4265a151945..49d6bfdb689 100644 --- a/distributed/deploy/cluster.py +++ b/distributed/deploy/cluster.py @@ -93,12 +93,10 @@ def scale(self, n): if n >= len(self.scheduler.workers): self.scheduler.loop.add_callback(self.scale_up, n) else: - to_close = self.scheduler.retire_workers( - remove=False, - close_workers=True, - n=len(self.scheduler.workers) - n - ) - logger.debug("Closing workers: %s", to_close) + to_close = self.scheduler.workers_to_close( + n=len(self.scheduler.workers) - n) + print("Closing workers: %s", to_close) + self.scheduler.loop.add_callback(self.scheduler.retire_workers, to_close) self.scheduler.loop.add_callback(self.scale_down, to_close) def _widget_status(self): From 67f558484c26e868e77c1e317399cf1473170623 Mon Sep 17 00:00:00 2001 From: Joseph Hamman Date: Wed, 8 Aug 2018 11:46:48 -0600 Subject: [PATCH 2/3] workers kwarg --- distributed/deploy/cluster.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distributed/deploy/cluster.py b/distributed/deploy/cluster.py index 49d6bfdb689..3f966b62e00 100644 --- a/distributed/deploy/cluster.py +++ b/distributed/deploy/cluster.py @@ -96,7 +96,7 @@ def scale(self, n): to_close = self.scheduler.workers_to_close( n=len(self.scheduler.workers) - n) print("Closing workers: %s", to_close) - self.scheduler.loop.add_callback(self.scheduler.retire_workers, to_close) + self.scheduler.loop.add_callback(self.scheduler.retire_workers, workers=to_close) self.scheduler.loop.add_callback(self.scale_down, to_close) def _widget_status(self): From 2610e852e70b42a2a800a48e8d9c598781c76ed9 Mon Sep 17 00:00:00 2001 From: Joseph Hamman Date: Wed, 8 Aug 2018 13:16:17 -0600 Subject: [PATCH 3/3] use logger instead of print --- distributed/deploy/cluster.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distributed/deploy/cluster.py b/distributed/deploy/cluster.py index 3f966b62e00..0c647d7adc9 100644 --- a/distributed/deploy/cluster.py +++ b/distributed/deploy/cluster.py @@ -95,7 +95,7 @@ def scale(self, n): else: to_close = self.scheduler.workers_to_close( n=len(self.scheduler.workers) - n) - print("Closing workers: %s", to_close) + logger.debug("Closing workers: %s", to_close) self.scheduler.loop.add_callback(self.scheduler.retire_workers, workers=to_close) self.scheduler.loop.add_callback(self.scale_down, to_close)