tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix ES_PRESET not being applied to Chewy's internal index (#26489)

Browse Source
This commit is contained in:
Claire 2023-08-14 19:00:56 +02:00 committed by GitHub
parent 90ec88d58b
commit dd049fc37a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/initializers/chewy.rb
View File

@ -15,6 +15,9 @@ Chewy.settings = {
journal: false, journal: false,
user: user, user: user,
password: password, password: password,
index: {
number_of_replicas: ['single_node_cluster', nil].include?(ENV['ES_PRESET'].presence) ? 0 : 1,
},
} }
# We use our own async strategy even outside the request-response # We use our own async strategy even outside the request-response

3
lib/mastodon/cli/search.rb
View File

@ -18,6 +18,7 @@ module Mastodon::CLI
option :only, type: :array, enum: %w(instances accounts tags statuses), desc: 'Only process these indices' option :only, type: :array, enum: %w(instances accounts tags statuses), desc: 'Only process these indices'
option :import, type: :boolean, default: true, desc: 'Import data from the database to the index' option :import, type: :boolean, default: true, desc: 'Import data from the database to the index'
option :clean, type: :boolean, default: true, desc: 'Remove outdated documents from the index' option :clean, type: :boolean, default: true, desc: 'Remove outdated documents from the index'
option :reset_chewy, type: :boolean, default: false, desc: "Reset Chewy's internal index"
desc 'deploy', 'Create or upgrade Elasticsearch indices and populate them' desc 'deploy', 'Create or upgrade Elasticsearch indices and populate them'
long_desc <<~LONG_DESC long_desc <<~LONG_DESC
If Elasticsearch is empty, this command will create the necessary indices If Elasticsearch is empty, this command will create the necessary indices
@ -42,6 +43,8 @@ module Mastodon::CLI
importers = indices.index_with { |index| "Importer::#{index.name}Importer".constantize.new(batch_size: options[:batch_size], executor: pool) } importers = indices.index_with { |index| "Importer::#{index.name}Importer".constantize.new(batch_size: options[:batch_size], executor: pool) }
progress = ProgressBar.create(total: nil, format: '%t%c/%u |%b%i| %e (%r docs/s)', autofinish: false) progress = ProgressBar.create(total: nil, format: '%t%c/%u |%b%i| %e (%r docs/s)', autofinish: false)
Chewy::Stash::Specification.reset! if options[:reset_chewy]
# First, ensure all indices are created and have the correct # First, ensure all indices are created and have the correct
# structure, so that live data can already be written # structure, so that live data can already be written
indices.select { |index| index.specification.changed? }.each do |index| indices.select { |index| index.specification.changed? }.each do |index|