Merge branch...

Merge branch '34722-dashboard-projectscontroller-should-tolerate-single-gitaly-node-failure' into 'master'

Fix 503 errors caused by Gitaly failures during project_icon lookup

See merge request gitlab-org/gitlab!23930

app/helpers/avatars_helper.rb

@@ -122,6 +122,13 @@ module AvatarsHelper
     else
       source_identicon(source, options)
     end
+
+  rescue GRPC::Unavailable, GRPC::DeadlineExceeded => e
+    # Handle Gitaly connection issues gracefully
+    Gitlab::ErrorTracking
+      .track_exception(e, source_type: source.class.name, source_id: source.id)
+
+    source_identicon(source, options)
   end
 
   def source_identicon(source, options = {})

changelogs/unreleased/34722-project-icon-lookup-fix.yml

+---
+title: Fix 503 errors caused by Gitaly failures during project_icon lookup
+merge_request: 23930
+author:
+type: fixed

spec/helpers/avatars_helper_spec.rb

@@ -22,15 +22,41 @@ describe AvatarsHelper do
       end
     end
 
-    context 'when providing a project' do
-      it_behaves_like 'resource with a default avatar', 'project' do
-        let(:resource) { create(:project, name: 'foo') }
-        let(:helper_args) { [resource] }
+    shared_examples 'Gitaly exception handling' do
+      before do
+        allow(resource).to receive(:avatar_url).and_raise(error_class)
       end
 
+      it 'handles Gitaly exception gracefully' do
+        expect(Gitlab::ErrorTracking).to receive(:track_exception).with(
+          an_instance_of(error_class), source_type: 'Project', source_id: resource.id
+        )
+        expect { project_icon(resource) }.not_to raise_error
+      end
+
+      it_behaves_like 'resource with a default avatar', 'project'
+    end
+
+    context 'when providing a project' do
+      let(:helper_args) { [resource] }
+      let(:resource) { create(:project, name: 'foo') }
+
+      it_behaves_like 'resource with a default avatar', 'project'
+
       it_behaves_like 'resource with a custom avatar', 'project' do
         let(:resource) { create(:project, :public, avatar: File.open(uploaded_image_temp_path)) }
-        let(:helper_args) { [resource] }
+      end
+
+      context 'when Gitaly is unavailable' do
+        let(:error_class) { GRPC::Unavailable }
+
+        include_examples 'Gitaly exception handling'
+      end
+
+      context 'when Gitaly request is taking too long' do
+        let(:error_class) { GRPC::DeadlineExceeded }
+
+        include_examples 'Gitaly exception handling'
       end
     end