From 6d79f1c0b62b2f5da30aae212ee6a4082916a5ce Mon Sep 17 00:00:00 2001
From: Dane Pitkin <dane@voltrondata.com>
Date: Tue, 22 Aug 2023 16:57:22 -0400
Subject: [PATCH] Wait for minio server to start up

---
 python/pyarrow/tests/conftest.py | 46 ++++++++++++++++++++++++++++++++
 python/pyarrow/tests/test_fs.py  |  3 +--
 2 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/python/pyarrow/tests/conftest.py b/python/pyarrow/tests/conftest.py
index c398687db09d0..241ae4814a5ae 100644
--- a/python/pyarrow/tests/conftest.py
+++ b/python/pyarrow/tests/conftest.py
@@ -15,10 +15,13 @@
 # specific language governing permissions and limitations
 # under the License.
 
+import functools
 import os
 import pathlib
 import subprocess
 import sys
+import time
+import urllib.request
 
 import pytest
 from pytest_lazyfixture import lazy_fixture
@@ -146,8 +149,48 @@ def s3_connection():
     return host, port, access_key, secret_key
 
 
+def retry(attempts=3, delay=1.0, max_delay=None, backoff=1):
+    """
+    Retry decorator
+
+    Parameters
+    ----------
+    attempts : int, default 3
+        The number of attempts.
+    delay : float, default 1
+        Initial delay in seconds.
+    max_delay : float, optional
+        The max delay between attempts.
+    backoff : float, default 1
+        The multiplier to delay after each attempt.
+    """
+    def decorate(func):
+        @functools.wraps(func)
+        def wrapper(*args, **kwargs):
+            remaining_attempts = attempts
+            curr_delay = delay
+            while remaining_attempts > 0:
+                try:
+                    return func(*args, **kwargs)
+                except Exception as err:
+                    remaining_attempts -= 1
+                    last_exception = err
+                    curr_delay *= backoff
+                    if max_delay:
+                        curr_delay = min(curr_delay, max_delay)
+                    time.sleep(curr_delay)
+            raise last_exception
+        return wrapper
+    return decorate
+
+
 @pytest.fixture(scope='session')
 def s3_server(s3_connection, tmpdir_factory):
+    @retry(attempts=5, delay=0.1, backoff=2)
+    def minio_server_health_check(address):
+        resp = urllib.request.urlopen(f"http://{address}/minio/health/cluster")
+        assert resp.getcode() == 200
+
     tmpdir = tmpdir_factory.getbasetemp()
     host, port, access_key, secret_key = s3_connection
 
@@ -166,6 +209,9 @@ def s3_server(s3_connection, tmpdir_factory):
     except OSError:
         pytest.skip('`minio` command cannot be located')
     else:
+        # Wait for the server to startup before yielding
+        minio_server_health_check(address)
+
         yield {
             'connection': s3_connection,
             'process': proc,
diff --git a/python/pyarrow/tests/test_fs.py b/python/pyarrow/tests/test_fs.py
index cdb44c5b3bae3..8135f70f6905c 100644
--- a/python/pyarrow/tests/test_fs.py
+++ b/python/pyarrow/tests/test_fs.py
@@ -245,8 +245,7 @@ def s3fs(request, s3_server):
         endpoint_override='{}:{}'.format(host, port),
         scheme='http',
         allow_bucket_creation=True,
-        allow_bucket_deletion=True,
-        connect_timeout=10
+        allow_bucket_deletion=True
     )
     fs.create_dir(bucket)