Polish parsing of worker-saturation from config

dask · Nov 3, 2022 · 3fec109 · 3fec109
1 parent aa1c6d8
commit 3fec109
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/distributed/scheduler.py b/distributed/scheduler.py
@@ -1646,13 +1646,18 @@ def __init__(
             / 2.0
         )
 
-        sat = dask.config.get("distributed.scheduler.worker-saturation")
-        try:
-            self.WORKER_SATURATION = float(sat)
-        except ValueError:
-            raise ValueError(
-                f"Unsupported `distributed.scheduler.worker-saturation` value {sat!r}. Must be a float."
+        self.WORKER_SATURATION = dask.config.get(
+            "distributed.scheduler.worker-saturation"
+        )
+        if (
+            not isinstance(self.WORKER_SATURATION, (int, float))
+            or self.WORKER_SATURATION <= 0
+        ):
+            raise ValueError(  # pragma: nocover
+                "`distributed.scheduler.worker-saturation` must be a float > 0; got "
+                + repr(self.WORKER_SATURATION)
             )
+
         self.transition_counter = 0
         self._idle_transition_counter = 0
         self.transition_counter_max = transition_counter_max

diff --git a/distributed/tests/test_scheduler.py b/distributed/tests/test_scheduler.py
@@ -505,7 +505,6 @@ def func(first, second):
     "saturation_config, expected_task_counts",
     [
         (2.5, (5, 3)),
-        ("2.5", (5, 3)),
         (2.0, (4, 2)),
         (1.1, (3, 2)),
         (1.0, (2, 1)),