From c6b1043e9d1b7fe9912c330b6e7d4342f2a9694e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=99=88=20=20jacopo=20beschi=20=F0=9F=99=89?= Date: Wed, 18 Apr 2018 09:19:40 +0000 Subject: Resolve "Make a Rubocop that forbids returning from a block" --- lib/tasks/gitlab/storage.rake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/tasks') diff --git a/lib/tasks/gitlab/storage.rake b/lib/tasks/gitlab/storage.rake index 8ac73bc8ff2..6e8bd9078c8 100644 --- a/lib/tasks/gitlab/storage.rake +++ b/lib/tasks/gitlab/storage.rake @@ -111,7 +111,7 @@ namespace :gitlab do puts " - #{project.full_path} (id: #{project.id})".color(:red) - return if counter >= limit # rubocop:disable Lint/NonLocalExitFromIterator + return if counter >= limit # rubocop:disable Lint/NonLocalExitFromIterator, Cop/AvoidReturnFromBlocks end end end @@ -132,7 +132,7 @@ namespace :gitlab do puts " - #{upload.path} (id: #{upload.id})".color(:red) - return if counter >= limit # rubocop:disable Lint/NonLocalExitFromIterator + return if counter >= limit # rubocop:disable Lint/NonLocalExitFromIterator, Cop/AvoidReturnFromBlocks end end end -- cgit v1.2.1 From bbccd310573bb70e6b413c2bde915fcb8810716e Mon Sep 17 00:00:00 2001 From: Zeger-Jan van de Weg Date: Thu, 19 Apr 2018 10:40:28 +0200 Subject: Check Gitaly when running `rake dev:setup` Before this change, trying to setup dev environment could be tried without having at least one Gitaly running. Cloning the repositories would fail, but not stop the setup. Given this would lead to an inconsistent state, a check was added if we could connect to the server. Output when it fails: ``` $ rake dev:setup Failed to connect to Gitaly... Error: 14:Connect Failed ``` --- lib/tasks/gitlab/setup.rake | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'lib/tasks') diff --git a/lib/tasks/gitlab/setup.rake b/lib/tasks/gitlab/setup.rake index 1d903c81358..f71e69987cb 100644 --- a/lib/tasks/gitlab/setup.rake +++ b/lib/tasks/gitlab/setup.rake @@ -1,9 +1,20 @@ namespace :gitlab do desc "GitLab | Setup production application" task setup: :gitlab_environment do + check_gitaly_connection setup_db end + def check_gitaly_connection + Gitlab.config.repositories.storages.each do |name, _details| + Gitlab::GitalyClient::ServerService.new(name).info + end + rescue GRPC::Unavailable => ex + puts "Failed to connect to Gitaly...".color(:red) + puts "Error: #{ex}" + exit 1 + end + def setup_db warn_user_is_not_gitlab -- cgit v1.2.1