Merge branch 'cablett-graphql-handle-timeout' into 'master'

GraphQL: More informative timeout message

See merge request gitlab-org/gitlab!90319

app/controllers/graphql_controller.rb

@@ -82,6 +82,13 @@ def execute
     render_error(exception.message, status: :unprocessable_entity)
   end
 
+  rescue_from ActiveRecord::QueryAborted do |exception|
+    log_exception(exception)
+
+    error = "Request timed out. Please try a less complex query or a smaller set of records."
+    render_error(error, status: :service_unavailable)
+  end
+
   override :feature_category
   def feature_category
     ::Gitlab::FeatureCategories.default.from_request(request) || super

spec/controllers/graphql_controller_spec.rb

@@ -27,6 +27,18 @@
       )
     end
 
+    it 'handles a timeout nicely' do
+      allow(subject).to receive(:execute) do
+        raise ActiveRecord::QueryCanceled, '**taps wristwatch**'
+      end
+
+      post :execute
+
+      expect(json_response).to include(
+        'errors' => include(a_hash_including('message' => /Request timed out/))
+      )
+    end
+
     it 'handles StandardError' do
       allow(subject).to receive(:execute) do
         raise StandardError, message