techhub/mastodon
2
0
Fork 0
Code Activity

Fix dashboard warning about Elasticsearch index mismatch not showing up (#34567)

Browse Source 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
This commit is contained in:
Eugen Rochko
2025-04-28 15:59:49 +02:00
committed by GitHub
parent 17d8e2b6e3
commit 715cbee93d
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/lib/admin/system_check/elasticsearch_check.rb
View File

@@ -16,7 +16,7 @@ class Admin::SystemCheck::ElasticsearchCheck < Admin::SystemCheck::BaseCheck
def pass? def pass?
return true unless Chewy.enabled? return true unless Chewy.enabled?
running_version.present? && compatible_version? && cluster_health['status'] == 'green' && indexes_match? && preset_matches? running_version.present? && compatible_version? && cluster_health['status'] == 'green' && indexes_match? && specifications_match? && preset_matches?
rescue Faraday::ConnectionFailed, Elasticsearch::Transport::Transport::Error rescue Faraday::ConnectionFailed, Elasticsearch::Transport::Transport::Error
false false
end end
@@ -40,7 +40,7 @@ class Admin::SystemCheck::ElasticsearchCheck < Admin::SystemCheck::BaseCheck
) )
elsif !specifications_match? elsif !specifications_match?
Admin::SystemCheck::Message.new( Admin::SystemCheck::Message.new(
:elasticsearch_analysis_mismatch, :elasticsearch_analysis_index_mismatch,
mismatched_specifications_indexes.join(' ') mismatched_specifications_indexes.join(' ')
) )
elsif cluster_health['status'] == 'red' elsif cluster_health['status'] == 'red'

3
spec/lib/admin/system_check/elasticsearch_check_spec.rb
View File

@@ -29,6 +29,9 @@ RSpec.describe Admin::SystemCheck::ElasticsearchCheck do
}, },
}, },
}) })
[AccountsIndex, StatusesIndex, PublicStatusesIndex, InstancesIndex, TagsIndex].each do |index|
allow(index).to receive(:specification).and_return(instance_double(Chewy::Index::Specification, changed?: false))
end
end end
context 'when running version is present and high enough' do context 'when running version is present and high enough' do