Skip to content

Commit 62da268

Browse files
* Poke the CI * Bump Kubernetes versions * Verify things pass with dask/distributed@74a1bcd * Remove deprecated CI runs to speed up testing * Pin to commit that I suspect is causing this, expect this run to fail * Pin to previous commit which I expect to pass * Implement workaround * Revert removed CI files * Copy asynchronous checking from SpecCluster * Add comment
1 parent 5644984 commit 62da268

File tree

2 files changed

+19
-8
lines changed

2 files changed

+19
-8
lines changed

.github/workflows/operator.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ jobs:
4040
fail-fast: false
4141
matrix:
4242
python-version: ["3.9", "3.10"]
43-
kubernetes-version: ["1.27.0"]
43+
kubernetes-version: ["1.27.3"]
4444
include:
4545
- python-version: "3.10"
46-
kubernetes-version: "1.24.13"
46+
kubernetes-version: "1.24.15"
4747
- python-version: "3.10"
48-
kubernetes-version: "1.25.9"
48+
kubernetes-version: "1.25.11"
4949
- python-version: "3.10"
50-
kubernetes-version: "1.26.4"
50+
kubernetes-version: "1.26.6"
5151

5252
env:
5353
KUBECONFIG: .pytest-kind/pytest-kind/kubeconfig

dask_kubernetes/operator/kubecluster/kubecluster.py

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,9 +178,10 @@ def __init__(
178178
scheduler_service_type=None,
179179
custom_cluster_spec=None,
180180
scheduler_forward_port=None,
181+
loop=None,
182+
asynchronous=False,
181183
**kwargs,
182184
):
183-
184185
name = dask.config.get("kubernetes.name", override_with=name)
185186
self.namespace = (
186187
dask.config.get("kubernetes.namespace", override_with=namespace)
@@ -261,8 +262,18 @@ def __init__(
261262
self._rich_spinner = Spinner("dots", speed=0.5)
262263
self._startup_component_status = {}
263264

264-
super().__init__(name=name, **kwargs)
265-
if not self.asynchronous:
265+
super().__init__(name=name, loop=loop, asynchronous=asynchronous, **kwargs)
266+
267+
# If https://github.com/dask/distributed/pull/7941 is merged we can
268+
# simplify the next 8 lines to ``if not self.called_from_running_loop:``
269+
try:
270+
called_from_running_loop = (
271+
getattr(loop, "asyncio_loop", None) is asyncio.get_running_loop()
272+
)
273+
except RuntimeError:
274+
called_from_running_loop = asynchronous
275+
276+
if not called_from_running_loop:
266277
self._loop_runner.start()
267278
self.sync(self._start)
268279

@@ -543,7 +554,7 @@ async def generate_rich_output(self):
543554
table.add_column("Component")
544555
table.add_column("Status", justify="right")
545556

546-
for (label, component) in [
557+
for label, component in [
547558
("DaskCluster", "cluster"),
548559
("Scheduler Pod", "schedulerpod"),
549560
("Scheduler Service", "schedulerservice"),

0 commit comments

Comments
 (0)