diff --git a/GITLAB_ELASTICSEARCH_INDEXER_VERSION b/GITLAB_ELASTICSEARCH_INDEXER_VERSION
index f77856a6f1af5be6984fa25aaa2e17616e1030ab..e91d9be2a86d6b81d600227ebed342393ca0bd6c 100644
--- a/GITLAB_ELASTICSEARCH_INDEXER_VERSION
+++ b/GITLAB_ELASTICSEARCH_INDEXER_VERSION
@@ -1 +1 @@
-4.3.1
+4.3.3
diff --git a/ee/app/models/concerns/elastic/projects_search.rb b/ee/app/models/concerns/elastic/projects_search.rb
index 7c3b3b0a5d63609984cd64832670314f1bd09668..fb0dd0763fb7bdccfff1c76d2b3d31cc467d7dc1 100644
--- a/ee/app/models/concerns/elastic/projects_search.rb
+++ b/ee/app/models/concerns/elastic/projects_search.rb
@@ -24,7 +24,11 @@ def maintain_elasticsearch_update(updated_attributes: previous_changes.keys)
return if pending_delete?
updated_attributes = updated_attributes.map(&:to_sym)
- if updated_attributes.include?(:visibility_level) || updated_attributes.include?(:repository_access_level)
+ # repository_access_level wiki_access_level are the attributes on project_feature
+ # So we have to check the previous_changes on project_feature
+ updated_attributes.concat(project_feature.previous_changes.keys.map(&:to_sym))
+
+ if (updated_attributes & %i[visibility_level repository_access_level wiki_access_level]).any?
maintain_elasticsearch_permissions
end
diff --git a/ee/app/services/elastic/process_initial_bookkeeping_service.rb b/ee/app/services/elastic/process_initial_bookkeeping_service.rb
index 989936120809069af000bf0555d3b8b5fa34b2f3..c1c4dff00a80f7ca2fbdd196cf3a462a34b1619c 100644
--- a/ee/app/services/elastic/process_initial_bookkeeping_service.rb
+++ b/ee/app/services/elastic/process_initial_bookkeeping_service.rb
@@ -30,9 +30,9 @@ def backfill_projects!(*projects)
ElasticCommitIndexerWorker.perform_async(project.id, false, { force: true })
if Feature.enabled?(:separate_elastic_wiki_indexer_for_project)
- ElasticWikiIndexerWorker.perform_async project.id, project.class.name
+ ElasticWikiIndexerWorker.perform_async project.id, project.class.name, { force: true }
else
- ElasticCommitIndexerWorker.perform_async project.id, true
+ ElasticCommitIndexerWorker.perform_async project.id, true, { force: true }
end
end
end
diff --git a/ee/app/workers/elastic_wiki_indexer_worker.rb b/ee/app/workers/elastic_wiki_indexer_worker.rb
index 18e68c248b9998dcc66c2216d5ecb55d3e708637..3567ebb386a449a004d390e716ede5368f23a939 100644
--- a/ee/app/workers/elastic_wiki_indexer_worker.rb
+++ b/ee/app/workers/elastic_wiki_indexer_worker.rb
@@ -16,7 +16,7 @@ class ElasticWikiIndexerWorker
# container_id - The ID of the container(project/group) to index
# container_type - The class of the container(project/group) to index
# The indexation will cover all commits within INDEXED_SHA..HEAD
- def perform(container_id, container_type, _options = {})
+ def perform(container_id, container_type, options = {})
if container_id.nil? || container_type.nil?
logger.error(message: 'container_id or container_type can not be nil', container_id: container_id,
container_type: container_type)
@@ -36,10 +36,13 @@ def perform(container_id, container_type, _options = {})
return true unless container&.use_elasticsearch?
+ options = options.with_indifferent_access
+
+ force = !!options[:force]
search_indexing_duration_s = Benchmark.realtime do
@ret = in_lock("#{self.class.name}/#{container_type}/#{container_id}",
ttl: (Gitlab::Elastic::Indexer.timeout + 1.minute), retries: 0) do
- Gitlab::Elastic::Indexer.new(container, wiki: true).run
+ Gitlab::Elastic::Indexer.new(container, wiki: true, force: force).run
end
end
diff --git a/ee/spec/models/concerns/elastic/project_spec.rb b/ee/spec/models/concerns/elastic/project_spec.rb
index 4464687461d909d6038a6845bf14bd98ed39a1e8..7a6333e87c36813e6ac75ef82364f6e7f145bbb5 100644
--- a/ee/spec/models/concerns/elastic/project_spec.rb
+++ b/ee/spec/models/concerns/elastic/project_spec.rb
@@ -184,17 +184,6 @@
expect(described_class.elastic_search('"someone_elses_project"', options: { project_ids: project_ids }).total_count).to eq(0)
end
- it 'does not update Elasticsearch if pending_delete is true' do
- expect(Elastic::ProcessInitialBookkeepingService).to receive(:track!)
- project = create(:project)
-
- expect(Elastic::ProcessBookkeepingService).to receive(:track!)
- project.update!(name: 'test 1')
-
- expect(Elastic::ProcessBookkeepingService).not_to receive(:track!)
- project.update!(pending_delete: true)
- end
-
it "finds partial matches in project names" do
project_ids = []
diff --git a/ee/spec/models/concerns/elastic/projects_search_spec.rb b/ee/spec/models/concerns/elastic/projects_search_spec.rb
index bd5235c4b10ec331fafd96b0d48ef1984a47ac36..c5419502498526137dafafdf20b8de13cadd013a 100644
--- a/ee/spec/models/concerns/elastic/projects_search_spec.rb
+++ b/ee/spec/models/concerns/elastic/projects_search_spec.rb
@@ -2,7 +2,7 @@
require 'spec_helper'
-RSpec.describe Elastic::ProjectsSearch do
+RSpec.describe Elastic::ProjectsSearch, feature_category: :global_search do
subject do
Class.new do
include Elastic::ProjectsSearch
@@ -18,6 +18,10 @@ def es_id
def pending_delete?
false
end
+
+ def project_feature
+ ProjectFeature.new
+ end
end.new
end
@@ -34,7 +38,7 @@ def pending_delete?
expect(::Elastic::ProcessBookkeepingService).to receive(:track!).and_return(true)
expect(::Elastic::ProcessInitialBookkeepingService).to receive(:backfill_projects!).and_return(true)
- subject.maintain_elasticsearch_update(updated_attributes: %i[visibility_level repository_access_level])
+ subject.maintain_elasticsearch_update(updated_attributes: %i[visibility_level])
end
end
diff --git a/ee/spec/models/ee/project_spec.rb b/ee/spec/models/ee/project_spec.rb
index 297266aa0451cb28d9bfb2a240c14e332967e206..698573ebd7aa0467dbaaa003ddb8327b3ef48580 100644
--- a/ee/spec/models/ee/project_spec.rb
+++ b/ee/spec/models/ee/project_spec.rb
@@ -4228,4 +4228,48 @@ def stub_default_url_options(host)
expect(project.project_feature.requirements_access_level).to eq(ProjectFeature::ENABLED)
end
end
+
+ describe 'concern Elastic::ProjectsSearch' do
+ include Elastic::ProjectsSearch
+ describe '#maintain_elasticsearch_update' do
+ def new_level(level)
+ Featurable::STRING_OPTIONS.except('public').values.excluding(level).last # public is only allowed for pages
+ end
+
+ let_it_be(:project) { create(:project) }
+ let(:project_feature) { project.project_feature }
+
+ before do
+ stub_ee_application_setting(elasticsearch_indexing: true)
+ # Clear all dirty changes before each test
+ project.reload
+ project_feature.reload
+ end
+
+ it 'calls Elastic::ProcessBookkeepingService when project visibility_level gets updated' do
+ expect(Elastic::ProcessInitialBookkeepingService).to receive(:backfill_projects!).with(project)
+ new_visibility_level = new_level(project.visibility_level)
+ project.update_attribute(:visibility_level, new_visibility_level)
+ end
+
+ it 'calls Elastic::ProcessInitialBookkeepingService when wiki_access_level gets updated' do
+ expect(Elastic::ProcessInitialBookkeepingService).to receive(:backfill_projects!).with(project)
+ new_wiki_access_level = new_level(project.wiki_access_level)
+ project_feature.update_attribute :wiki_access_level, new_wiki_access_level
+ end
+
+ it 'calls Elastic::ProcessInitialBookkeepingService when repository_access_level gets updated' do
+ expect(Elastic::ProcessInitialBookkeepingService).to receive(:backfill_projects!).with(project)
+ new_repository_access_level = new_level(project.repository_access_level)
+ project_feature.update_attribute :repository_access_level, new_repository_access_level
+ end
+
+ it 'does not calls Elastic::ProcessInitialBookkeepingService when pending_delete is set on project' do
+ project = create(:project, pending_delete: true)
+ expect(Elastic::ProcessInitialBookkeepingService).not_to receive(:backfill_projects!).with(project)
+ new_visibility_level = new_level(project.visibility_level)
+ project.update_attribute :visibility_level, new_visibility_level
+ end
+ end
+ end
end
diff --git a/ee/spec/services/elastic/process_initial_bookkeeping_service_spec.rb b/ee/spec/services/elastic/process_initial_bookkeeping_service_spec.rb
index 7a628baa2129ebe91ccad2c1ef3e9ec62cf60234..4264ea748ac26dd2b83d2b71b8abb3418bebc291 100644
--- a/ee/spec/services/elastic/process_initial_bookkeeping_service_spec.rb
+++ b/ee/spec/services/elastic/process_initial_bookkeeping_service_spec.rb
@@ -10,7 +10,7 @@
it 'calls ElasticCommitIndexerWorker and, ElasticWikiIndexerWorker if feature separate_elastic_wiki_indexer_for_project is enabled' do
expect(described_class).to receive(:maintain_indexed_associations).with(project, Elastic::ProcessInitialBookkeepingService::INDEXED_PROJECT_ASSOCIATIONS)
expect(ElasticCommitIndexerWorker).to receive(:perform_async).with(project.id, false, { force: true })
- expect(ElasticWikiIndexerWorker).to receive(:perform_async).with(project.id, project.class.name)
+ expect(ElasticWikiIndexerWorker).to receive(:perform_async).with(project.id, project.class.name, { force: true })
described_class.backfill_projects!(project)
end
@@ -19,7 +19,7 @@
stub_feature_flags(separate_elastic_wiki_indexer_for_project: false)
expect(described_class).to receive(:maintain_indexed_associations).with(project, Elastic::ProcessInitialBookkeepingService::INDEXED_PROJECT_ASSOCIATIONS)
expect(ElasticCommitIndexerWorker).to receive(:perform_async).with(project.id, false, { force: true })
- expect(ElasticCommitIndexerWorker).to receive(:perform_async).with(project.id, true)
+ expect(ElasticCommitIndexerWorker).to receive(:perform_async).with(project.id, true, { force: true })
described_class.backfill_projects!(project)
end
diff --git a/ee/spec/workers/elastic_delete_project_worker_spec.rb b/ee/spec/workers/elastic_delete_project_worker_spec.rb
index b312138e2fb0a8e737112cfec4ae64aa62feeca7..94a6a57118c5a4803ca687a159093c47ba6cdb0a 100644
--- a/ee/spec/workers/elastic_delete_project_worker_spec.rb
+++ b/ee/spec/workers/elastic_delete_project_worker_spec.rb
@@ -26,6 +26,8 @@ def search_options
milestone = create(:milestone, project: project)
note = create(:note, project: project)
merge_request = create(:merge_request, target_project: project, source_project: project)
+ project.wiki.create_page('index_page', 'Bla bla term')
+ project.wiki.index_wiki_blobs
ElasticCommitIndexerWorker.new.perform(project.id)
ensure_elasticsearch_index!
@@ -39,6 +41,8 @@ def search_options
expect(MergeRequest.elastic_search('*', **search_options).records).to include(merge_request)
expect(Repository.elastic_search('*', **search_options)[:blobs][:results].response).not_to be_empty
expect(Repository.find_commits_by_message_with_elastic('*').count).to be > 0
+ expect(ProjectWiki.__elasticsearch__.elastic_search_as_wiki_page('*',
+ options: { project_id: project.id })).not_to be_empty
subject.perform(project.id, project.es_id)
@@ -51,6 +55,8 @@ def search_options
expect(MergeRequest.elastic_search('*', **search_options).total_count).to be(0)
expect(Repository.elastic_search('*', **search_options)[:blobs][:results].response).to be_empty
expect(Repository.find_commits_by_message_with_elastic('*').count).to be(0)
+ expect(ProjectWiki.__elasticsearch__.elastic_search_as_wiki_page('*',
+ options: { project_id: project.id })).to be_empty
# verify that entire index is empty
# searches use joins on the parent record (project)
diff --git a/ee/spec/workers/elastic_wiki_indexer_worker_spec.rb b/ee/spec/workers/elastic_wiki_indexer_worker_spec.rb
index f518f7c987759ab1a103503f8fd551e4ef7c7126..f8de9f5521bf3a2e856c33a5fd8b1a5462b344bb 100644
--- a/ee/spec/workers/elastic_wiki_indexer_worker_spec.rb
+++ b/ee/spec/workers/elastic_wiki_indexer_worker_spec.rb
@@ -42,14 +42,28 @@
end
context 'when elasticsearch is enabled for Project' do
- it 'does runs Gitlab::Elastic::Indexer and does performs logging and metrics' do
- expect_next_instance_of(Gitlab::Elastic::Indexer) do |indexer|
- expect(indexer).to receive(:run).and_return(true)
+ context 'and options force is passed as true' do
+ it 'does runs Gitlab::Elastic::Indexer with force and does performs logging and metrics' do
+ expect_next_instance_of(Gitlab::Elastic::Indexer, project, { wiki: true, force: true }) do |indexer|
+ expect(indexer).to receive(:run).and_return(true)
+ end
+ expect(Gitlab::Elasticsearch::Logger).to receive(:build).and_return(logger_double.as_null_object)
+ expect(logger_double).to receive(:info)
+ expect(Gitlab::Metrics::GlobalSearchIndexingSlis).to receive(:record_apdex)
+ worker.perform(project.id, project.class.name, { force: true })
+ end
+ end
+
+ context 'and options is not passed' do
+ it 'does runs Gitlab::Elastic::Indexer without force and does performs logging and metrics' do
+ expect_next_instance_of(Gitlab::Elastic::Indexer, project, { wiki: true, force: false }) do |indexer|
+ expect(indexer).to receive(:run).and_return(true)
+ end
+ expect(Gitlab::Elasticsearch::Logger).to receive(:build).and_return(logger_double.as_null_object)
+ expect(logger_double).to receive(:info)
+ expect(Gitlab::Metrics::GlobalSearchIndexingSlis).to receive(:record_apdex)
+ worker.perform(project.id, project.class.name)
end
- expect(Gitlab::Elasticsearch::Logger).to receive(:build).and_return(logger_double.as_null_object)
- expect(logger_double).to receive(:info)
- expect(Gitlab::Metrics::GlobalSearchIndexingSlis).to receive(:record_apdex)
- worker.perform(project.id, project.class.name)
end
end
end