From f810bf10e746aacebd9d4d54d763a974b2cbde8a Mon Sep 17 00:00:00 2001
From: John McDonnell <jmcdonnell@gitlab.com>
Date: Fri, 26 Nov 2021 01:03:03 +0000
Subject: [PATCH] Improve reliability of praefect wait check

---
 qa/qa/service/praefect_manager.rb | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/qa/qa/service/praefect_manager.rb b/qa/qa/service/praefect_manager.rb
index 089e7b11554cc..dd4cce5d0b086 100644
--- a/qa/qa/service/praefect_manager.rb
+++ b/qa/qa/service/praefect_manager.rb
@@ -199,6 +199,13 @@ def wait_for_praefect
           max_duration: 180,
           retry_on_exception: true
         )
+
+        QA::Runtime::Logger.info('Wait until Praefect starts and is listening')
+        wait_until_shell_command_matches(
+          "docker exec #{@praefect} bash -c 'cat /var/log/gitlab/praefect/current'",
+          /listening at tcp address/
+        )
+
         wait_for_gitaly_check
       end
 
-- 
GitLab