From fa3990ac0742e7999db9af2e3f85f27a5696bfba Mon Sep 17 00:00:00 2001 From: Eric O Date: Sat, 14 Dec 2024 14:43:34 -0500 Subject: [PATCH] Increase some Docker and Fedora wait timeouts --- docker/fedora/setup-and-start.sh | 4 ++-- lib/tasks/hyacinth/docker.rake | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/fedora/setup-and-start.sh b/docker/fedora/setup-and-start.sh index 18eae96c3..06f25203d 100644 --- a/docker/fedora/setup-and-start.sh +++ b/docker/fedora/setup-and-start.sh @@ -23,13 +23,13 @@ if [ ! -f /opt/fedora/tomcat/bin/catalina.sh ]; then # Give Fedora some time to start up and create various first-time startup files # We're waiting until we get a 200 status (with maximum timeout wait time) - timeout 20s bash -c 'until curl --output /dev/null --silent --head --fail http://localhost:8081/fedora/; do sleep 1; done' + timeout 30s bash -c 'until curl --output /dev/null --silent --head --fail http://localhost:8081/fedora/; do sleep 1; done' # Stop Fedora so that we can apply some overrides /opt/fedora/tomcat/bin/catalina.sh stop # Give Fedora some time to stop (with maximum timeout wait time) - timeout 20s bash -c 'while pgrep "java" > /dev/null; do sleep 1; done' + timeout 30s bash -c 'while pgrep "java" > /dev/null; do sleep 1; done' # Revert server.xml change so that Fedora will run on port 8080 the next time we start it up. rm /opt/fedora/tomcat/conf/server.xml diff --git a/lib/tasks/hyacinth/docker.rake b/lib/tasks/hyacinth/docker.rake index a8bf99d83..b81713502 100644 --- a/lib/tasks/hyacinth/docker.rake +++ b/lib/tasks/hyacinth/docker.rake @@ -14,7 +14,7 @@ namespace :hyacinth do expected_port = docker_compose_config['services']['solr']['ports'][0].split(':')[0] url_to_check = "http://localhost:#{expected_port}/solr/hyacinth/admin/system" puts "Waiting for Solr to become available (at #{url_to_check})..." - Timeout.timeout(20, Timeout::Error, 'Timed out during Solr startup check.') do + Timeout.timeout(30, Timeout::Error, 'Timed out during Solr startup check.') do loop do begin sleep 0.25 @@ -35,7 +35,7 @@ namespace :hyacinth do expected_port = docker_compose_config['services']['fedora']['ports'][0].split(':')[0] url_to_check = "http://localhost:#{expected_port}/fedora/describe" puts "Waiting for Fedora to become available (at #{url_to_check})..." - Timeout.timeout(60, Timeout::Error, 'Timed out during Fedora startup check.') do + Timeout.timeout(90, Timeout::Error, 'Timed out during Fedora startup check.') do loop do begin sleep 0.25