diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-29 00:09:42 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-29 00:09:42 +0300 |
| commit | 9037472904908109f5622a8a1e808c6225eced56 (patch) | |
| tree | b11dac0e16b7c4101ca9389664bbf8b964d448dc /qa/qa/service/praefect_manager.rb | |
| parent | b420660ef1369fec4d09b7bf5e961d81980974e5 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa/qa/service/praefect_manager.rb')
| -rw-r--r-- | qa/qa/service/praefect_manager.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qa/qa/service/praefect_manager.rb b/qa/qa/service/praefect_manager.rb index 8563c3656a8..eab41572cda 100644 --- a/qa/qa/service/praefect_manager.rb +++ b/qa/qa/service/praefect_manager.rb @@ -30,7 +30,7 @@ module QA wait_until_shell_command_matches(dataloss_command, /Outdated repositories/) end - def replicated?(project_id) + def replicated?(project_id, project_name_prefix = 'gitaly_cluster') Support::Retrier.retry_until(raise_on_failure: false) do replicas = wait_until_shell_command(%(docker exec #{@gitlab} bash -c 'gitlab-rake "gitlab:praefect:replicas[#{project_id}]"')) do |line| QA::Runtime::Logger.debug(line.chomp) @@ -40,7 +40,7 @@ module QA # ---------------------------------------------------------------------------------------------------------------------------------------------------------------- # gitaly_cluster-3aff1f2bd14e6c98 | 23c4422629234d62b62adacafd0a33a8364e8619 | 23c4422629234d62b62adacafd0a33a8364e8619 | 23c4422629234d62b62adacafd0a33a8364e8619 # - break line if line.start_with?('gitaly_cluster') + break line if line.start_with?(project_name_prefix) break nil if line.include?('Something went wrong when getting replicas') end next false unless replicas |