solr8 WIP use docker healthcheck

Author: barmintor

docker/templates/docker-compose.development.yml

@@ -25,6 +25,13 @@ services:
       - /opt/solr/conf
       - "-Xms256m"
       - "-Xmx512m"
+    healthcheck:
+      # this is a backend test so port will always be 8983 - NOT the forwarded port
+      test: ["CMD-SHELL", "curl -sf http://localhost:8983/solr/dcv/admin/ping?wt=json | grep -io \"OK\" || exit 1"]
+      start_period: 5s
+      interval: 2s
+      timeout: 20s
+      retries: 7
   fedora:
     build: ./fedora
     restart: always

docker/templates/docker-compose.test.yml

@@ -25,6 +25,13 @@ services:
       - /opt/solr/conf
       - "-Xms256m"
       - "-Xmx512m"
+    healthcheck:
+      # this is a backend test so port will always be 8983 - NOT the forwarded port
+      test: ["CMD-SHELL", "curl -sf http://localhost:8983/solr/dcv/admin/ping?wt=json | grep -io \"OK\" || exit 1"]
+      start_period: 5s
+      interval: 2s
+      timeout: 20s
+      retries: 7
   fedora:
     build: ./fedora
     restart: always

lib/tasks/dcv/docker.rake

@@ -12,12 +12,14 @@ namespace :dcv do
 
     def wait_for_solr_cores_to_load
       expected_port = docker_compose_config['services']['solr']['ports'][0].split(':')[0]
-      Timeout.timeout(10, Timeout::Error, 'Timed out during solr startup check.') do
+      solr_id = `docker compose -f #{Rails.root.join(docker_compose_file_path)} ps -q solr`
+
+      Timeout.timeout(20, Timeout::Error, 'Timed out during solr startup check.') do
         loop do
           sleep 0.25
-          status_code = Net::HTTP.get_response(URI("http://localhost:#{expected_port}/solr/dcv/update?wt=json")).code
-          break if status_code != '503'
-        rescue EOFError, Errno::ECONNRESET
+          status = `docker inspect --format "{{.State.Health.Status}}" #{solr_id}`.strip
+          break if status == 'healthy'
+        rescue EOFError
           next
         end
       end