From 2a1e95da16b0aba73b74665846860b9ee28bc786 Mon Sep 17 00:00:00 2001
From: Charles Blackmon-Luca <20627856+charlesbluca@users.noreply.github.com>
Date: Wed, 11 May 2022 08:33:48 -0700
Subject: [PATCH 1/4] Switch to dask dev images

---
 .github/docker-compose.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/docker-compose.yaml b/.github/docker-compose.yaml
index 56ec50b47..bc61ba9c5 100644
--- a/.github/docker-compose.yaml
+++ b/.github/docker-compose.yaml
@@ -3,13 +3,13 @@ version: '3'
 services:
     dask-scheduler:
         container_name: dask-scheduler
-        image: daskdev/dask:latest
+        image: daskdev/dask:dev
         command: dask-scheduler
         ports:
             - "8786:8786"
     dask-worker:
         container_name: dask-worker
-        image: daskdev/dask:latest
+        image: daskdev/dask:dev
         command: dask-worker dask-scheduler:8786
         environment:
             EXTRA_CONDA_PACKAGES: "pyarrow>1.0.0"  # required for parquet IO

From baa39b2fb5e9cab6ff14359688f6a7cf8b19a98e Mon Sep 17 00:00:00 2001
From: Charles Blackmon-Luca <20627856+charlesbluca@users.noreply.github.com>
Date: Wed, 11 May 2022 08:42:25 -0700
Subject: [PATCH 2/4] Use mamba for conda installs in images

---
 .github/docker-compose.yaml | 1 +
 .github/workflows/test.yml  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/docker-compose.yaml b/.github/docker-compose.yaml
index bc61ba9c5..87431cd6f 100644
--- a/.github/docker-compose.yaml
+++ b/.github/docker-compose.yaml
@@ -12,6 +12,7 @@ services:
         image: daskdev/dask:dev
         command: dask-worker dask-scheduler:8786
         environment:
+            USE_MAMBA: "true"
             EXTRA_CONDA_PACKAGES: "pyarrow>1.0.0"  # required for parquet IO
         volumes:
             - /tmp:/tmp
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b590260f7..c2e71ecff 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -174,7 +174,7 @@ jobs:
           docker-compose -f .github/docker-compose.yaml up -d
 
           # Wait for installation
-          sleep 40
+          sleep 10
 
           docker logs dask-scheduler
           docker logs dask-worker

From 3dfe756d8e83921ac031a5debc59f96b144169cf Mon Sep 17 00:00:00 2001
From: Charles Blackmon-Luca <20627856+charlesbluca@users.noreply.github.com>
Date: Wed, 11 May 2022 09:09:03 -0700
Subject: [PATCH 3/4] Remove sleep call for installation

---
 .github/workflows/test.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c2e71ecff..c5031ebf4 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -173,9 +173,6 @@ jobs:
         run: |
           docker-compose -f .github/docker-compose.yaml up -d
 
-          # Wait for installation
-          sleep 10
-
           docker logs dask-scheduler
           docker logs dask-worker
       - name: Test with pytest while running an independent dask cluster

From 07e55423501bb5a3347a34cc4a4f2fca9274bd4c Mon Sep 17 00:00:00 2001
From: Charles Blackmon-Luca <20627856+charlesbluca@users.noreply.github.com>
Date: Mon, 16 May 2022 09:51:36 -0700
Subject: [PATCH 4/4] Use timeout / until to wait for cluster to be initialized

---
 .github/workflows/test.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c5031ebf4..6201afec8 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -173,6 +173,9 @@ jobs:
         run: |
           docker-compose -f .github/docker-compose.yaml up -d
 
+          # periodically ping logs until a connection has been established; assume failure after 2 minutes
+          timeout 2m bash -c 'until docker logs dask-worker 2>&1 | grep -q "Starting established connection"; do sleep 1; done'
+
           docker logs dask-scheduler
           docker logs dask-worker
       - name: Test with pytest while running an independent dask cluster