Commit 6a9dc4cb authored by Stan Hu's avatar Stan Hu

Merge branch 'es_suppress_not_found_error' into 'master'

[Elastic] Suppress ActiveRecord::RecordNotFound error in ElasticIndexWorker

Fixes https://gitlab.com/gitlab-com/infrastructure/issues/233

See merge request !577
parents b4eed194 c9e4a145
......@@ -9,6 +9,7 @@ v 8.10.0 (unreleased)
- Make Elasticsearch indexer run as an async task
- Fix of removing wiki data from index when project is deleted
- Ticket-based Kerberos authentication (SPNEGO)
- [Elastic] Suppress ActiveRecord::RecordNotFound error in ElasticIndexWorker
v.8.9.7 (unreleased)
- Fix error in admin dashboard when Geo is enabled and current node is nil.
......
......@@ -21,7 +21,7 @@ class ElasticIndexerWorker
clear_project_indexes(record_id) if klass == Project
end
rescue Elasticsearch::Transport::Transport::Errors::NotFound
rescue Elasticsearch::Transport::Transport::Errors::NotFound, ActiveRecord::RecordNotFound
true # Less work to do!
end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment